Detect merge strategy when cherry-picking PRs for backport#9518
Merged
Conversation
The release task assumed every PR was merged with "Create a merge commit" and used `git cherry-pick -m 1 MERGE_COMMIT_SHA`. For PRs merged with "Rebase and merge" `merge_commit_sha` is just the tip of the rebased commits, so picking only that one silently drops the preceding commits and typically conflicts. Inspect the parent count of `merge_commit_sha` and, when it is not a merge commit, fetch the PR commits from GitHub to decide between squash (single commit) and rebase (range of N commits). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
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 was the end-user or developer problem that led to this PR?
The release task assumed every PR was merged with "Create a merge commit" and used
git cherry-pick -m 1 MERGE_COMMIT_SHA.So, I couldn't backport #5029 because this PR has merge commit.
What is your fix for the problem, implemented in this PR?
For PRs merged with "Rebase and merge"
merge_commit_shais just the tip of the rebased commits, so picking only that one silently drops the preceding commits and typically conflicts.Inspect the parent count of
merge_commit_shaand, when it is not a merge commit, fetch the PR commits from GitHub to decide between squash (single commit) and rebase (range of N commits).Make sure the following tasks are checked