Using Git Worktrees

What This Skill Does

• This skill helps users create isolated Git worktrees, enabling simultaneous work on multiple branches without switching.
• It guides the user through directory selection and safety verification to ensure reliable isolation.
• This skill is useful for managing multiple tasks or features in parallel within the same repository.

When to Use

• Working on multiple features or bug fixes concurrently.
• Maintaining a stable branch while experimenting with new code.
• Isolating changes to avoid conflicts with other work.
• Reviewing code in a separate environment.
• Testing different configurations without affecting the main branch.
• Switching between tasks without committing unfinished work.

Key Features

• Creates isolated workspaces for parallel development.
• Guides directory selection for worktree creation.
• Verifies directory is ignored to prevent accidental commits.
• Detects project name for worktree organization.
• Provides safety verification steps for reliable isolation.
• Supports both project-local and global worktree locations.

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."

Directory Selection Process

Follow this priority order:

1. Check Existing Directories

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

grep -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:

No worktree directory found. Where should I create worktrees?

.worktrees/ (project-local, hidden) ~/.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:

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": Add appropriate line to .gitignore Commit the change 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

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

2. Create Worktree

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:

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:

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

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

Quick Reference

Common Mistakes

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 Workflow

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

[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 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: 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 subagent-driven-development - REQUIRED before executing any tasks executing-plans - REQUIRED before executing any tasks Any skill needing isolated workspace

Pairs with: finishing-a-development-branch - REQUIRED for cleanup after work completeUsing Git Worktrees

1. Detect Project Name

project=$(base