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

feat: speed up rollback command (backport #636) #648

Merged
merged 2 commits into from
Dec 26, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 12, 2022

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

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

You are currently cherry-picking commit d4086fe.
  (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:   CHANGELOG.md
	modified:   mutable_tree.go

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

# Conflicts:
#	nodedb.go
@mergify mergify bot requested a review from a team as a code owner December 12, 2022 10:19
@mergify mergify bot added the conflicts label Dec 12, 2022
nodedb.go Outdated Show resolved Hide resolved
Copy link
Member

@tac0turtle tac0turtle left a comment

Choose a reason for hiding this comment

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

merging this but will do testing before the release

@tac0turtle tac0turtle merged commit 007cd55 into release/v0.19.x Dec 26, 2022
@tac0turtle tac0turtle deleted the mergify/bp/release/v0.19.x/pr-636 branch December 26, 2022 09:50
ankurdotb pushed a commit to cheqd/iavl that referenced this pull request Feb 28, 2023
Co-authored-by: yihuang <huang@crypto.com>
Co-authored-by: Marko Baricevic <marbar3778@yahoo.com>
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