[Backport release-ff] fix(consensus): cutover QC handling and parent proposal fetch#4710
Draft
github-actions[bot] wants to merge 2 commits into
Draft
[Backport release-ff] fix(consensus): cutover QC handling and parent proposal fetch#4710github-actions[bot] wants to merge 2 commits into
github-actions[bot] wants to merge 2 commits into
Conversation
Contributor
Author
|
Please cherry-pick the changes locally and resolve any conflicts. git fetch origin backport-4702-to-release-ff
git worktree add --checkout .worktree/backport-4702-to-release-ff backport-4702-to-release-ff
cd .worktree/backport-4702-to-release-ff
git reset --hard HEAD^
git cherry-pick -x 37385605d677b1e0f2cd3f9d4d9233e7e2ec56a3
git push --force-with-lease |
Contributor
Author
|
See the workflow run for details. This PR needs to be resolved manually. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Description
Backport of #4702 to
release-ff.