worktree-cleanup

To remove a git worktree and delete its branch, the skill navigates to the repository root, executes git worktree remove in a single shell call, and then deletes the corresponding local branch, surfacing any git errors encountered during the process.

Automating git worktree cleanup involves identifying the target worktree, safely removing it via a single bash command from the repo root, and subsequently deleting the associated branch to prevent repository clutter and orphaned worktrees.

Git worktree removal can fail due to uncommitted changes or errors. This skill avoids automatic force removal, surfaces the specific git errors clearly, and prompts for user confirmation to guide you through safe rescue options.

This skill targets a single worktree and its corresponding branch per execution, moving to the repo root and executing git worktree remove once, followed by deleting the branch, ensuring safe and verified cleanup rather than batch force removal.

You do not always need to manually specify the worktree; the skill can identify the target worktree to remove and will prompt you to select a target when none is explicitly provided.

You should use automated worktree cleanup after a merged PR workflow or consolidated sub-scope work completes to prevent orphaned worktrees, as it safely enforces user confirmation for edge cases and avoids accidental force removal.