skills/reinamaccredy/maestro/using-git-worktrees

using-git-worktrees

Originally fromobra/superpowers
SKILL.md

Using Git Worktrees

Core Principles

  1. Systematic selection - Follow priority: existing dir > CLAUDE.md > ask user
  2. Safety first - Always verify .gitignore for project-local worktrees
  3. Clean baseline - Run tests before starting work

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

Quick Reference

Situation Action
.worktrees/ exists Use it (verify .gitignore)
worktrees/ exists Use it (verify .gitignore)
Both exist Use .worktrees/
Neither exists Check CLAUDE.md → Ask user
Not in .gitignore Add immediately + commit
Tests fail Report failures + ask before proceeding

Basic Workflow

# Check existing
ls -d .worktrees worktrees 2>/dev/null

# Verify gitignore (project-local only)
grep -q "^\.worktrees/$" .gitignore

# Create
git worktree add .worktrees/$BRANCH -b $BRANCH
cd .worktrees/$BRANCH

# Setup + verify
npm install  # or cargo build, pip install, etc.
npm test     # must pass before starting

Anti-Patterns

  • Skipping .gitignore - Worktree contents pollute git status
  • Assuming location - Always follow priority order
  • Ignoring test failures - Can't distinguish new vs pre-existing bugs
  • Hardcoding setup - Auto-detect from package.json, Cargo.toml, etc.

References

Related

  • conductor - Design approval triggers worktree creation
  • finishing-a-development-branch - Cleanup after work complete
  • maestro-core - Plugin coordination context
Weekly Installs
5
GitHub Stars
23
First Seen
Jan 22, 2026
Installed on
claude-code4
opencode3
antigravity3
windsurf3
codex3
gemini-cli3