# Worktree Cleanup

> Remove merged or stale git worktrees. Use after PRs are merged, work is done, or when worktrees are no longer needed.

- Skill: `majiayu000/worktree-cleanup` (Agent Skill, multi-file: 2 files)
- Install (CLI): `npx skillmds@latest add majiayu000/worktree-cleanup`
- Raw SKILL.md: https://api.skillmd.com/api/skills/majiayu000/worktree-cleanup/raw
- Safety review: pending (external: skill-scanner PASS, skillspector PASS)
- Works with: Claude Code, Claude.ai, OpenAI Codex
- Category: Coding & Dev Tools
- Author: majiayu000 (https://skillmd.com/u/majiayu000)
- Updated: 2026-09-09
- Page: https://skillmd.com/skills/majiayu000/worktree-cleanup

---


# Worktree Cleanup

Remove worktrees safely to free disk space and maintain organization.

## When to Use

- PR has been merged
- Worktree no longer needed
- Free disk space
- Maintain clean worktree list

## Quick Reference

```bash
# Remove single worktree by path
git worktree remove worktrees/ProjectOdyssey-42-feature

# Auto-clean all merged worktrees
./scripts/cleanup_merged_worktrees.sh
```

## Workflow

1. **Verify state** - Check no uncommitted changes: `cd worktrees/ProjectOdyssey-42 && git status`
1. **Commit changes** - Make sure all changes are committed and the task is finished
1. **Switch away** - Don't be in the worktree you're removing
1. **Remove worktree** - Use git command
1. **Verify** - Run `git worktree list` to confirm removal

## Safety Checks

Before removing a worktree:

- Branch is merged to main (check GitHub PR status)
- No uncommitted changes (run `git status` in worktree)
- Not currently using the worktree (be in different directory)
- PR is actually merged (check "Development" section on issue)

## Error Handling

| Error | Solution |
|-------|----------|
| "Worktree has uncommitted changes" | Commit changes |
| "Not a worktree" | Verify path with `git worktree list` |
| "Worktree is main" | Don't remove primary worktree |

## Scripts Available

- `scripts/cleanup_merged_worktrees.sh` - Auto-clean merged worktrees

## References

- See `worktree-create` skill for creating worktrees