[INFRA] Complete cherry pick as part of merge script - #58214
Draft
nchammas wants to merge 1 commit into
Draft
Conversation
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.
What changes were proposed in this pull request?
When a conflict occurs on cherry picking a commit to a branch, ask the user to fix the conflict but have the script continue the cherry pick itself.
Why are the changes needed?
If the user calls
git cherry-pick --continuethemselves, it's likely that commit message lines starting with#will be interpreted as comments and stripped. This is what happened here. Compare the commit message on 9a75a1d (master) to 8cc56ea (branch-4.x) and note how every line beginning with#was stripped from the latter.Does this PR introduce any user-facing change?
No.
How was this patch tested?
I'm honestly not sure how best to test this. Will report back.
Was this patch authored or co-authored using generative AI tooling?
I wrote this with assistance from GitHub Copilot.