You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
On branch mergify/bp/v0.23/pr-8561
Your branch is up to date with 'origin/v0.23'.
You are currently cherry-picking commit 5d9130a3c.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Changes to be committed:
modified: ledger/src/snapshot_utils.rs
modified: runtime/src/bank.rs
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: runtime/src/accounts_db.rs
Branch rebase failed
First, rewinding head to replay your work on top of it...
Applying: Hack to skip cleanup_dead_slots upon snapshot load
Using index info to reconstruct a base tree...
M runtime/src/accounts_db.rs
Falling back to patching base and 3-way merge...
Auto-merging runtime/src/accounts_db.rs
CONFLICT (content): Merge conflict in runtime/src/accounts_db.rs
error: Failed to merge in the changes.
Patch failed at 0001 Hack to skip cleanup_dead_slots upon snapshot load
Use 'git am --show-current-patch' to see the failed patch
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Branch rebase failed
First, rewinding head to replay your work on top of it...
Applying: Hack to skip cleanup_dead_slots upon snapshot load
Using index info to reconstruct a base tree...
M runtime/src/accounts_db.rs
Falling back to patching base and 3-way merge...
Auto-merging runtime/src/accounts_db.rs
CONFLICT (content): Merge conflict in runtime/src/accounts_db.rs
error: Failed to merge in the changes.
Patch failed at 0001 Hack to skip cleanup_dead_slots upon snapshot load
Use 'git am --show-current-patch' to see the failed patch
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Branch rebase failed
First, rewinding head to replay your work on top of it...
Applying: Hack to skip cleanup_dead_slots upon snapshot load
Using index info to reconstruct a base tree...
M runtime/src/accounts_db.rs
Falling back to patching base and 3-way merge...
Auto-merging runtime/src/accounts_db.rs
CONFLICT (content): Merge conflict in runtime/src/accounts_db.rs
error: Failed to merge in the changes.
Patch failed at 0001 Hack to skip cleanup_dead_slots upon snapshot load
Use 'git am --show-current-patch' to see the failed patch
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Labels
automergeMerge this Pull Request automatically once CI passes
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is an automated backport of pull request #8561 done by Mergify.io
Cherry-pick of 5d9130a has failed:
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/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@Mergifyio backports <destination>
will backport this PR on<destination>
branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.io/