How does the cleanup process work?

You can use the /prune-worktrees command to automatically identify and remove worktrees associated with branches that have already been merged into the main branch.

How do I set up the repo for this workflow?

You need to run 'git config --local claude.worktrees true' and create the directory with 'mkdir -p .git/checkouts' to prepare your repository.

Does this skill activate automatically?

No, this is a user-invocable skill that must be explicitly loaded using the /worktree-workflow command to avoid interfering with standard git operations.

Why store worktrees in .git/checkouts/?

This convention keeps your working environment organized by grouping all active worktrees in one location while keeping them hidden from IDE file explorers and search results.

Git Worktree Workflow

Name: Git Worktree Workflow
Author: sttts

bysttts

•

Herramientas para Desarrolladores

Manages git worktrees using a centralized, hidden directory convention within the .git folder.

The Git Worktree Workflow skill implements an opinionated management strategy that keeps feature branches organized within a dedicated .git/checkouts/ directory. By centralizing worktrees inside the hidden .git folder, it prevents IDE clutter and workspace noise while providing a structured way to handle multi-tasking across different branches. This skill ensures developers stay in their designated worktree, prevents accidental modifications to the main branch, and provides automated tools for pruning merged branches to maintain a clean repository environment.

Características Principales

01Enforced safety rules to prevent premature task completion before branch merging

02Hidden worktree management to keep IDE file explorers focused on relevant code

03Automated cleanup of merged branches via the prune-worktrees command

04Explicit loading mechanism to ensure the workflow is only active when intended

05Standardized .git/checkouts/ convention for organized branch isolation

061 GitHub stars

Casos de Uso

01Concurrent development on multiple feature branches without stash or checkout overhead

02Reviewing and testing pull requests in isolated environments while keeping current work intact

03Maintaining a clean project root directory by hiding auxiliary checkouts within git internal folders

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add sttts/skills worktree-workflow

For use in Claude.ai and ChatGPT

Download Skill