Repository navigation
Keep commits pushed to a branch after it was merged - #66
Merged
Merged
Conversation
If someone pushed to a branch after GitHub squash-merged it but before autorestack ran, autorestack recorded the new commit as a parent of the child without its changes, then deleted the branch. Reproduced locally, not seen in production. Now the child is re-parented from the commit GitHub merged, and the branch is deleted only if it has not moved. Otherwise the run fails and the branch stays. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Phlogistique
marked this pull request as ready for review
November 6, 2026 16:57
Phlogistique
added a commit
that referenced
this pull request
Nov 8, 2026
Deleting the merged branch is the last step, after the children are updated and retargeted, but a delete that fails aborts the run and turns it red. Someone clicking "Delete branch" on the merged PR right after merging is enough to race it, as happened on scortexio/sensei#8247. If the branch still exists but moved, the run still fails and the branch stays, as in #66. Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
If someone pushed to a branch after GitHub squash-merged it but before autorestack ran, autorestack recorded the new commit as a parent of the child without its changes, then deleted the branch. Reproduced locally, not seen in production.
Now the child is re-parented from the commit GitHub merged, and the branch is deleted only if it has not moved. Otherwise the run fails and the branch stays.