Skip to content

Commit dbc48ba

Browse files
Phlogistiqueclaude
andauthored
Document GitHub's stale diff after retargeting (#54)
Hit on #50 today: after the retarget to main, GitHub kept comparing against the deleted parent branch tip and showed a 323-line diff for a 14-line change. A push to the head branch eventually got it to recompute. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
1 parent bf02a40 commit dbc48ba

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ jobs:
135135
* Built for squash merges. A PR merged with a merge commit keeps its history, so the action only retargets its children and deletes the branch. Rebase merges are not supported: the action detects them through GitHub's commit-PR association (the merge method itself is recorded nowhere) and comments on each child PR instead of acting.
136136
* If a merge hits a conflict, you'll need to resolve it manually; pushing the resolution automatically continues the stack update
137137
* Very large stacks might hit GitHub rate limits
138+
* After retargeting, GitHub sometimes keeps rendering a PR's diff against its old, deleted base, so the PR appears to contain already-merged changes. The branch itself is correct (`git diff <base>...HEAD` shows the real diff). Pushing any commit to the PR usually makes GitHub recompute. Sometimes it doesn't. Tough luck.
138139

139140
---
140141

0 commit comments

Comments
 (0)