Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(baseapp): vote extensions on first block (backport #17909) #17922

Merged
merged 3 commits into from
Sep 29, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 28, 2023

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

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

You are currently cherry-picking commit c889a07ef.
  (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

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   baseapp/abci.go

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 c889a07)

# Conflicts:
#	baseapp/abci.go
@mergify mergify bot requested a review from a team as a code owner September 28, 2023 14:28
@mergify mergify bot added the conflicts label Sep 28, 2023
@github-actions
Copy link
Contributor

@mergify[bot] your pull request is missing a changelog!

baseapp/abci.go Fixed Show fixed Hide fixed
baseapp/abci.go Fixed Show fixed Hide fixed
Copy link
Contributor

@likhita-809 likhita-809 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hey @facundomedica can you fix the conflicts here ?

@facundomedica facundomedica merged commit 1cbae0d into release/v0.50.x Sep 29, 2023
47 of 48 checks passed
@facundomedica facundomedica deleted the mergify/bp/release/v0.50.x/pr-17909 branch September 29, 2023 12:52
@faddat faddat mentioned this pull request Nov 8, 2024
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants