Add tests for rebase and mixed merge/rebase workflows#30
Merged
Phlogistique merged 1 commit intomainfrom Feb 27, 2026
Merged
Conversation
Verifies the action works regardless of how the child PR synced with its parent during development: pure rebase, or merge-then-rebase — including cases where the child is NOT fully up to date with the parent at squash-merge time. In all cases, the `git merge origin/$MERGED_BRANCH` step in the action correctly brings the child up to date with whatever commits it was missing, and the synthetic 3-parent merge produces a clean PR diff. Co-Authored-By: Claude Opus 4.6 <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.
Verifies the action works regardless of how the child PR synced with its
parent during development: pure rebase, or merge-then-rebase — including
cases where the child is NOT fully up to date with the parent at
squash-merge time.
In all cases, the
git merge origin/$MERGED_BRANCHstep in the actioncorrectly brings the child up to date with whatever commits it was
missing, and the synthetic 3-parent merge produces a clean PR diff.