fix(stack): harden merge cleanup and stranded repair#31
Closed
aryasaatvik wants to merge 2 commits into
Closed
Conversation
Detach clean sibling worktrees that own a just-landed branch before deleting the local branch during stack merge cleanup. Dirty target owners now fail before hosted merge, matching descendant repair preflight behavior.
Use persisted child anchors that still match landed backup refs as replay boundaries after a partial squash-merge repair. This keeps later sync repairs from replaying already-squashed parent commits when the child has already been reparented to trunk.
aryasaatvik
force-pushed
the
pr/recover-stranded-squash-repair-anchors
branch
from
63c9643 to
aec1e21
Compare
aryasaatvik
changed the title
Owner
|
Merged directly to main (rebased cleanly after #30 landed). Authorship preserved. Thanks @aryasaatvik! |
kitlangton
pushed a commit
that referenced
this pull request
Jun 30, 2026
If stack merge persists the landed state but aborts before descendant repair, a later stack sync --apply can lose the correct replay boundary. In squash-merge repos, the child then replays both the already-squashed parent commits and its own, producing avoidable conflicts. Use the persisted branch anchor as a fallback replay boundary when the child is already parented to trunk and the stored anchor matches a backup/landed-* head, so stranded descendants replay only their own commits.
kitlangton
added a commit
that referenced
this pull request
Jun 30, 2026
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
2 participants
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.
Summary
Fix two stack merge repair failure modes: landed branches checked out in clean sibling worktrees are released before cleanup, and stranded squash-merge descendants can recover their persisted replay anchor.
Changes
Git.release(branch)cleanup and dirty-owner preflight for checked-out landed branches.backup/landed-*anchors when repairing already trunk-parented descendants.Tests
bun run testbun run typecheckbun run format:checkbun run lintbun run package:smoke