Repository navigation
Conversation
prune keeps unmerged work forever because it has no merge proof. retire replaces that proof with a verified snapshot: dirty tracked and untracked files become a commit on the tip (built in a temporary index), unknown ignored data becomes a 0600 ignored.tar, and both go through the existing bundle/restore/fsck archive. Open PRs, active processes, Git operations, locks, hidden index entries and a moved tip still preserve the work. Removal stays non-forced and the branch is deleted by expected SHA. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
This was referenced Nov 3, 2026
This branch was successfully deployed
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.
prunecan only remove work it proves merged, so abandoned branches (closed PRs, superseded stacks, experiments) pile up forever. At last count, 47 of 48 local worktrees were kept.scripts/worktree.sh retire <branch> --expect-head <SHA> [--apply] [--by <who>]swaps merge proof for a verified snapshot:.env,.probes, logs) goes intoignored.tar(mode 0600) beside the bundle.archive()path: bundle, restore into an empty bare repo,fsck --full, manifest.--expect-head.worktree remove, deletes the branch by expected SHA, and writes aretiredownership record.Documented in
docs/worktree-hygiene.md, with a pointer inAGENTS.md.Test plan
node --test scripts/test/*.test.mjs: 129 pass, including 9 new retire tests (dry run, dirty, untracked and ignored snapshot round-trip through a restored repo, clean retire, and refusals for open PR, head mismatch, active process, operation marker, locked worktree, main)unit + e2e (macOS)🤖 Generated with Claude Code