Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Dec 27, 2023

This is an automatic backport of pull request #18895 done by Mergify.
Cherry-pick of 5166c9f has failed:

On branch mergify/bp/release/v0.50.x/pr-18895
Your branch is up to date with 'origin/release/v0.50.x'.

You are currently cherry-picking commit 5166c9f89.
  (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:   baseapp/abci_test.go
	modified:   baseapp/abci_utils.go
	modified:   baseapp/abci_utils_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.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

(cherry picked from commit 5166c9f)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team December 27, 2023 09:15
@mergify
Copy link
Contributor Author

mergify bot commented Dec 27, 2023

⚠️ The sha of the head commit of this PR conflicts with #18900. Mergify cannot evaluate rules on this PR. ⚠️

@facundomedica
Copy link
Contributor

closing in favor of #18900 . This seems to be an accidental duplicate

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.

3 participants