---

name: using-git-worktrees description: Use when starting feature work that needs isolation from current workspace or before executing implementation plans - creates isolated git worktrees with smart directory selection and safety verification

Using Git Worktrees

Overview

Git worktrees create isolated workspaces sharing the same repository, allowing work on multiple branches simultaneously without switching.

Core principle: Systematic directory selection + safety verification = reliable isolation.

Announce at start: "I'm using the using-git-worktrees skill to set up an isolated workspace."

Step 0: Check If Already in Worktree

CRITICAL: Before attempting to create a new worktree, check if the current directory already IS a worktree.

Copy# Check if current directory is an auxiliary worktree
# Main repos have .git as a directory, worktrees have .git as a file
if [ -f .git ]; then
    echo "Already in worktree at $(pwd)"
    echo "Current branch: $(git branch --show-current)"
    echo "Proceeding directly to work"
    # Skip to work, do NOT create new worktree
    exit 0
fi

# Alternative: Compare git-dir with git-common-dir
if [ "$(git rev-parse --git-dir)" != "$(git rev-parse --git-common-dir)" ]; then
    echo "Already in worktree at $(pwd)"
    echo "Current branch: $(git branch --show-current)"
    echo "Proceeding directly to work"
    exit 0
fi

Recommended: Use [ -f .git ] check (simplest and most reliable).

Key distinction:

• Main repository: .git is a directory
• Auxiliary worktree: .git is a file pointing to main repo's git directory

If already in worktree:

• Announce: "Already in worktree at , current branch: "
• Skip worktree creation
• Proceed directly to the work

If NOT in worktree:

• Continue to Step 1 (Directory Selection Process)

Directory Selection Process

Follow this priority order:

1. Check Existing Directories

Copy# Check in priority order
ls -d .worktrees 2>/dev/null     # Preferred (hidden)
ls -d worktrees 2>/dev/null      # Alternative

If found: Use that directory. If both exist, .worktrees wins.

2. Check CLAUDE.md

Copygrep -i "worktree.*director" CLAUDE.md 2>/dev/null

If preference specified: Use it without asking.

3. Ask User

If no directory exists and no CLAUDE.md preference:

CopyNo worktree directory found. Where should I create worktrees?

1. .worktrees/ (project-local, hidden)
2. ~/.config/superpowers/worktrees/<project-name>/ (global location)

Which would you prefer?

Safety Verification

For Project-Local Directories (.worktrees or worktrees)

MUST verify directory is ignored before creating worktree:

Copy# Check if directory is ignored (respects local, global, and system gitignore)
git check-ignore -q .worktrees 2>/dev/null || git check-ignore -q worktrees 2>/dev/null

If NOT ignored:

Per Jesse's rule "Fix broken things immediately":

1. Add appropriate line to .gitignore
2. Commit the change
3. Proceed with worktree creation

Why critical: Prevents accidentally committing worktree contents to repository.

For Global Directory (~/.config/superpowers/worktrees)

No .gitignore verification needed - outside project entirely.

Creation Steps

1. Detect Project Name

Copyproject=$(basename "$(git rev-parse --show-toplevel)")

2. Create Worktree

Copy# Determine full path
case $LOCATION in
  .worktrees|worktrees)
    path="$LOCATION/$BRANCH_NAME"
    ;;
  ~/.config/superpowers/worktrees/*)
    path="~/.config/superpowers/worktrees/$project/$BRANCH_NAME"
    ;;
esac

# Create worktree with new branch
git worktree add "$path" -b "$BRANCH_NAME"
cd "$path"

3. Run Project Setup

Auto-detect and run appropriate setup:

Copy# Node.js
if [ -f package.json ]; then npm install; fi

# Rust
if [ -f Cargo.toml ]; then cargo build; fi

# Python
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
if [ -f pyproject.toml ]; then poetry install; fi

# Go
if [ -f go.mod ]; then go mod download; fi

4. Verify Clean Baseline

Run tests to ensure worktree starts clean:

Copy# Examples - use project-appropriate command
npm test
cargo test
pytest
go test ./...

If tests fail: Report failures, ask whether to proceed or investigate.

If tests pass: Report ready.

5. Report Location

CopyWorktree ready at <full-path>
Tests passing (<N> tests, 0 failures)
Ready to implement <feature-name>

Quick Reference

Common Mistakes

Not checking if already in worktree

• Problem: Creates duplicate worktrees when already working in one
• Fix: Always check [ -f .git ] first (simplest and most reliable)

Skipping ignore verification

• Problem: Worktree contents get tracked, pollute git status
• Fix: Always use git check-ignore before creating project-local worktree

Assuming directory location

• Problem: Creates inconsistency, violates project conventions
• Fix: Follow priority: existing > CLAUDE.md > ask

Proceeding with failing tests

• Problem: Can't distinguish new bugs from pre-existing issues
• Fix: Report failures, get explicit permission to proceed

Hardcoding setup commands

• Problem: Breaks on projects using different tools
• Fix: Auto-detect from project files (package.json, etc.)

Example Workflows

Example 1: Already in Worktree

CopyYou: I'm using the using-git-worktrees skill to set up an isolated workspace.

[Check if already in worktree]
[ -f .git ] → TRUE (file exists, not directory)
[Detect: Current directory IS a worktree]
[Announce] Already in worktree at /Users/jesse/myproject/.worktrees/auth
          Current branch: feature/auth
[Skip creation, proceed to work]

Ready to implement in existing worktree

Example 2: Create New Worktree

CopyYou: I'm using the using-git-worktrees skill to set up an isolated workspace.

[Check if already in worktree]
[ -f .git ] → FALSE (.git is a directory, not a file)
[Check .worktrees/ - exists]
[Verify ignored - git check-ignore confirms .worktrees/ is ignored]
[Create worktree: git worktree add .worktrees/auth -b feature/auth]
[Run npm install]
[Run npm test - 47 passing]

Worktree ready at /Users/jesse/myproject/.worktrees/auth
Tests passing (47 tests, 0 failures)
Ready to implement auth feature

Red Flags

Never:

• Create worktree without checking if already in one
• Create worktree without verifying it's ignored (project-local)
• Skip baseline test verification
• Proceed with failing tests without asking
• Assume directory location when ambiguous
• Skip CLAUDE.md check

Always:

• Check [ -f .git ] FIRST (most reliable worktree detection)
• Follow directory priority: existing > CLAUDE.md > ask
• Verify directory is ignored for project-local
• Auto-detect and run project setup
• Verify clean test baseline

Integration

Called by:

• brainstorming (Phase 4) - REQUIRED when design is approved and implementation follows
• Any skill needing isolated workspace

Pairs with:

• finishing-a-development-branch - REQUIRED for cleanup after work complete
• executing-plans or subagent-driven-development - Work happens in this worktree