From 4c1f1fd03c1f662967a1f81691f584042765c4b6 Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 9 Jun 2026 20:43:40 +0000 Subject: [PATCH] Stop calling the upstack push a force-push in the README The action only fast-forwards updated branches; the synthetic merge commit is built as a descendant of the old head precisely so the push is not a force-push. The README claimed otherwise. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f55449e..6e19752 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 (direct children only) 3. Creates a synthetic merge commit with three parents (child tip, deleted branch tip, squash commit) to preserve history without re-introducing code 4. Updates the direct child PRs to base on trunk now that the bottom change has landed -5. Force-pushes updated branches and deletes the merged branch +5. Pushes updated branches and deletes the merged branch **Note:** Indirect descendants (grandchildren, etc.) are intentionally not modified. Their PR diffs remain correct because the merge-base calculation still works—the synthetic merge commit includes the original parent commit as an ancestor. When their direct parent is eventually merged, they become direct children and get updated at that point.