Skip to content

Clarify rationale for direct-child retargeting #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Phlogistique merged 1 commit into from
Dec 26, 2025
Merged

Clarify rationale for direct-child retargeting #17

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ This action tries to fix that in a transparent way. Install it, and hopefully th
2. Finds PRs that were based on the merged branch
3. For direct children: creates a synthetic merge commit with three parents (child tip, deleted branch tip, squash commit) to preserve history without re-introducing code
4. For indirect descendants: merges the updated parent branch
5. Updates each PR's base branch to point to trunk
5. Updates the direct child PRs to base on trunk now that the bottom change has landed; higher PRs stay based on their parent
6. Force-pushes updated branches and deletes the merged branch

### Conflict handling
Expand Down