Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 26, 2024

This is an automatic backport of pull request #2016 done by Mergify.
Cherry-pick of f4d73cd has failed:

On branch mergify/bp/v0.38.x/pr-2016
Your branch is up to date with 'origin/v0.38.x'.

You are currently cherry-picking commit f4d73cd5a.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   blocksync/msgs.go
	modified:   blocksync/reactor.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	added by them:   .changelog/v0.38.3/improvements/2016-blocksync-avoid-double-calling-block-from-proto.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…#2016)

for performance reasons.
Closes #1964

---

#### PR checklist

- [ ] ~~Tests written/updated~~
- [x] Changelog entry added in `.changelog` (we use
[unclog](https://github.com/informalsystems/unclog) to manage our
changelog)
- [x] Updated relevant documentation (`docs/` or `spec/`) and code
comments

(cherry picked from commit f4d73cd)

# Conflicts:
#	.changelog/v0.38.3/improvements/2016-blocksync-avoid-double-calling-block-from-proto.md
@mergify mergify bot requested a review from a team as a code owner January 26, 2024 10:26
@mergify mergify bot added the conflicts label Jan 26, 2024
@melekes melekes merged commit 04636a8 into v0.38.x Jan 26, 2024
@melekes melekes deleted the mergify/bp/v0.38.x/pr-2016 branch January 26, 2024 11:37
roy-dydx pushed a commit to dydxprotocol/cometbft that referenced this pull request Feb 3, 2025
… (backport cometbft#2016) (cometbft#2145)

This is an automatic backport of pull request cometbft#2016 done by
[Mergify](https://mergify.com).
Cherry-pick of f4d73cd has failed:
```
On branch mergify/bp/v0.38.x/pr-2016
Your branch is up to date with 'origin/v0.38.x'.

You are currently cherry-picking commit f4d73cd.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   blocksync/msgs.go
	modified:   blocksync/reactor.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	added by them:   .changelog/v0.38.3/improvements/2016-blocksync-avoid-double-calling-block-from-proto.md

```


To fix up this pull request, you can check it out locally. See
documentation:
https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

---


<details>
<summary>Mergify commands and options</summary>

<br />

More conditions and actions can be found in the
[documentation](https://docs.mergify.com/).

You can also trigger Mergify actions by commenting on this pull request:

- `@Mergifyio refresh` will re-evaluate the rules
- `@Mergifyio rebase` will rebase this PR on its base branch
- `@Mergifyio update` will merge the base branch into this PR
- `@Mergifyio backport <destination>` will backport this PR on
`<destination>` branch

Additionally, on Mergify [dashboard](https://dashboard.mergify.com) you
can:

- look at your merge queues
- generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com
</details>

---------

Co-authored-by: Anton Kaliaev <anton.kalyaev@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants