Skip to content

Commit 5af8925

Browse files
authored
Clarify direct child retargeting rationale (#17)
1 parent fb022a0 commit 5af8925

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ This action tries to fix that in a transparent way. Install it, and hopefully th
2020
2. Finds PRs that were based on the merged branch
2121
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
2222
4. For indirect descendants: merges the updated parent branch
23-
5. Updates each PR's base branch to point to trunk
23+
5. Updates the direct child PRs to base on trunk now that the bottom change has landed; higher PRs stay based on their parent
2424
6. Force-pushes updated branches and deletes the merged branch
2525

2626
### Conflict handling

0 commit comments

Comments
 (0)