using-git-worktrees

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

By sickn33 · 546 installs

npx skills add sickn33/agentic-awesome-skills --skill using-git-worktrees

Source repository · Upstream listing

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 If found: Use that directory. If both exist, .worktrees wins. 2. Check CLAUDE.md If preference specified: Use it without asking. 3. Ask User If no directory exists and no CLAUDE.md preference: Safety Verification For Project Local Directories (.worktrees or worktrees) MUST verify directory is ignored before creating worktree: 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 2. Create Worktree 3. Run Project Setup Auto detect and run appropriate setup: 4. Verify Clean Baseline Run tests to ensure worktree starts clean: If tests fail: Report failures, ask whether to proceed or investigate. If tests pass: Report ready. 5. Report Location Quick Reference Situation Action .worktrees/ exists Use it (verify ignored) worktrees/ exists Use it (verify ignored) Both exist Use .worktrees/ Neither exists Check CLAUDE.md → Ask user Directory not ignored Add to .gitignore + commit Tests fail during baseline Report failures + ask No package.json/Cargo.toml Skip dependency install 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 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 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 When to Use This skill is applicable to execute the workflow or actions described in the overview. Limitations Use this skill only when the task clearly matches the scope described above. Do not treat the output as a substitute for environment specific validation, testing, or expert review. Stop and ask for clarification if required inputs, permissions, safety boundaries, or success criteria are missing.