worktree-mastery

Worktree Mastery

Run 3-5 parallel Claude sessions on same repo. "The single biggest productivity unlock." - Boris Cherny

Core Concept

Git worktrees = independent working directories sharing one repo. Each Claude session gets its own worktree. No branch conflicts, no stash juggling.

Quick Setup

# From repo root, create worktrees
git worktree add ../myproject-review main
git worktree add ../myproject-refactor main
git worktree add ../myproject-test main

# List active worktrees
git worktree list

Naming Convention

myproject/           # Main worktree (original clone)
myproject-review/    # Code review session
myproject-refactor/  # Refactoring session
myproject-test/      # Test writing session
myproject-docs/      # Documentation session

Session Strategy

Worktree	Use Case
main	Primary development, commits
main-review	PR reviews, code reading
main-refactor	Large refactors, experiments
main-test	Test writing, debugging

Workflow

1. Create worktrees before starting parallel work
2. Start Claude in each worktree directory
3. Work independently - each session has isolated state
4. Sync via git - commit in one, pull in another
5. Cleanup when done

Sync Between Sessions

# In worktree needing updates
git fetch origin
git rebase origin/main

# Or if working on branches
git checkout feature-branch
git pull

References

• worktree-commands.md - Full command reference
• session-strategies.md - Multi-session patterns
• cleanup.md - Removal and maintenance