Git Worktree Management

Create and manage isolated git worktrees for task execution with automatic project setup and merge handling.

Overview

Git worktrees provide complete isolation for task work:

• Changes don’t affect main workspace until merge
• Can switch between tasks without stashing
• Clean baseline for each task
• Safe to experiment

Workflow

Step 1: Determine Worktree Directory

Find or create the worktree directory using this priority order:

1. Check for existing directory:

   # Preferred (hidden, less clutter)
   ls -d .worktrees 2>/dev/null
   # Alternative
   ls -d worktrees 2>/dev/null
   

2. Check CLAUDE.md for directive:

   worktree-dir: path/to/worktrees
   

3. Check README.md for configuration: Look for worktree or development setup instructions.

4. Ask user if not found:

   “Where should I create worktrees for isolated task work?

   1. .worktrees/ (Recommended – hidden, less clutter)
   2. worktrees/
   3. Custom location”

Step 2: Verify Directory is Gitignored

Critical: Ensure the worktree directory won’t be committed.

git check-ignore -q <worktree-dir>

If not ignored:

• Add to .gitignore with user confirmation
• Report the change

echo "<worktree-dir>/" >> .gitignore

Step 3: Create Branch and Worktree

Determine branch name from task:

• Input: TASK-004 or 4
• Branch: task/TASK-004
• Worktree path: <dir>/TASK-004

Create from current HEAD:

# Get current branch as base
BASE_BRANCH=$(git branch --show-current)

# Create branch and worktree in one command
git worktree add -b task/TASK-NNN <dir>/TASK-NNN

Record context:

• Base branch (for later merge)
• Worktree path
• Task ID

Step 4: Auto-Detect and Run Project Setup

Change to worktree directory and detect project type:

Check for custom setup:

1. Read CLAUDE.md for setup instructions
2. Read README.md for development setup section
3. Execute any documented setup steps

Step 5: Verify Baseline Tests Pass

Run the project’s test suite to ensure a clean starting point:

# Detect test command from package.json, Makefile, etc.
npm test          # Node.js
cargo test        # Rust
pytest            # Python
go test ./...     # Go
bundle exec rspec # Ruby

If tests fail:

“Baseline tests are failing in the worktree. This may indicate:

1. Setup incomplete – check dependencies
2. Tests require specific environment
3. Base branch has failing tests

Would you like to:

1. Continue anyway (tests may already be failing)
2. Abort and investigate”

Step 6: Return Worktree Context

Provide context for the calling skill:

## Worktree Created

**Task:** TASK-NNN
**Branch:** task/TASK-NNN
**Base Branch:** main
**Working Directory:** .worktrees/TASK-NNN
**Merge Mode:** [auto-merge|manual]

Project setup complete. Baseline tests passing.

Ready to begin work.

Merge Operations

Auto-Merge Flow

When task completes with auto-merge enabled:

# Ensure all changes committed in worktree
cd <worktree-path>
git status --porcelain  # Should be empty

# Return to main repo and merge
cd <original-repo>
git checkout <base-branch>
git merge --no-ff task/TASK-NNN -m "Merge task/TASK-NNN: [Task Title]"

# Cleanup
git worktree remove <worktree-path>
git branch -d task/TASK-NNN

Manual Verification Flow

When user wants to review before merge:

## Task Complete in Worktree

**Location:** .worktrees/TASK-NNN
**Branch:** task/TASK-NNN

All changes committed. To merge manually:
```bash
git checkout <base-branch>
git merge --no-ff task/TASK-NNN
git worktree remove .worktrees/TASK-NNN
git branch -d task/TASK-NNN

Or to continue working:

cd .worktrees/TASK-NNN

### Merge Conflict Handling

If merge conflicts occur:

```markdown
## Merge Conflict

The merge of task/TASK-NNN into <base-branch> has conflicts.

**Conflicting files:**
- path/to/file1.ts
- path/to/file2.ts

**Options:**
1. Resolve conflicts manually in the main repo
2. Abort merge and keep worktree for investigation

**To resolve:**
```bash
# In main repo after failed merge
git status                    # See conflicting files
# Edit files to resolve conflicts
git add <resolved-files>
git commit                    # Complete merge

# Then cleanup
git worktree remove .worktrees/TASK-NNN
git branch -d task/TASK-NNN

To abort:

git merge --abort
# Worktree preserved at .worktrees/TASK-NNN

## Error Handling

| Error | Recovery |
|-------|----------|
| Branch already exists | Offer to reuse existing branch or create new name |
| Worktree path exists | Check if it's valid, offer cleanup or different path |
| Not a git repository | Cannot use worktrees, fall back to current directory |
| Uncommitted changes | Prompt to commit or stash before creating worktree |
| Setup command fails | Report error, offer to continue or abort |

## Cleanup Commands

**Remove a worktree:**
```bash
git worktree remove <path>
git branch -d <branch>  # Safe delete (checks merge status)
git branch -D <branch>  # Force delete

List all worktrees:

git worktree list

Prune stale worktrees:

git worktree prune