From 6c16ce0815af2d5f3262d380cff1dd0eeb9a5462 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9=20Rubinstein?= Date: Thu, 25 Dec 2025 21:59:55 +0100 Subject: [PATCH] Clarify direct child retargeting rationale --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ad83229..aec00a2 100644 --- a/README.md +++ b/README.md @@ -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