diff --git a/.changeset/recover-stranded-anchors.md b/.changeset/recover-stranded-anchors.md new file mode 100644 index 0000000..ef198f6 --- /dev/null +++ b/.changeset/recover-stranded-anchors.md @@ -0,0 +1,5 @@ +--- +"@kitlangton/stack": patch +--- + +Recover stranded squash repair anchors: if `stack merge` persists state but aborts before descendant repair, a later `stack sync --apply` now uses the persisted anchor when it matches a `backup/landed-*` ref, so stranded descendants replay only their own commits instead of re-replaying the already-squashed parent. diff --git a/.changeset/release-landed-worktrees.md b/.changeset/release-landed-worktrees.md new file mode 100644 index 0000000..678b2d5 --- /dev/null +++ b/.changeset/release-landed-worktrees.md @@ -0,0 +1,5 @@ +--- +"@kitlangton/stack": patch +--- + +Detach clean sibling worktrees that own a landed branch before deleting it during `stack merge --apply` and `stack merge --auto` cleanup. Fails before hosted mutation when the target worktree is dirty.