git-worktrees
Git Worktrees
Work on multiple branches simultaneously without stashing or switching.
Worktree Location
All worktrees live in .worktrees/ at repo root.
project/
├── .worktrees/
│ ├── feat-auth/
│ └── fix-login/
└── (main working tree)
Naming Convention
Worktree folder matches branch name pattern:
| Branch | Worktree Folder |
|---|---|
yurifrl/feat/auth |
.worktrees/feat-auth |
yurifrl/fix/login-bug |
.worktrees/fix-login-bug |
hotfix/urgent |
.worktrees/hotfix-urgent |
Pattern: Take the last two segments, join with hyphen.
Commands
Create Worktree
# New branch
git worktree add .worktrees/<folder> -b <branch-name>
# Existing branch
git worktree add .worktrees/<folder> <existing-branch>
List Worktrees
git worktree list
Remove Worktree
git worktree remove .worktrees/<name>
Prune Stale
git worktree prune
Workflow
- Create worktree for feature/fix work
- Each worktree is independent (own node_modules, build cache, etc.)
- Remove worktree when branch is merged
- Run
git worktree pruneto clean up stale references
Tips
- Worktrees share the same
.git- commits are visible everywhere - Don't forget to install dependencies in new worktree
More from yurifrl/cly
charm-stack
Build terminal UIs with Bubbletea v2, Bubbles v2, Lipgloss v2, and Huh v2. Use when creating TUI applications, interactive forms, styled terminal output, or when user mentions Bubbletea, Bubbles, Lipgloss, Huh, Charm, or TUI development.
55cobra-modularity
Build modular CLI applications with Cobra framework. Use when structuring CLI commands, implementing modular command architecture, handling flags and arguments, or when user mentions Cobra, CLI modularity, command registration, or spf13/cobra.
15go-specialist
Go language consultant providing guidance on best practices, testing with testify, concurrency patterns, error handling, and technology stack recommendations. Use when answering Go questions, reviewing Go code, or advising on Go implementation approaches.
13cli-config
Manage CLI application configuration with Cobra and Viper. Use when implementing config files, environment variables, flags binding, or when user mentions Viper, configuration management, config files, or CLI settings.
10testing
Write tests using TDD principles with integration tests as default and minimal mocking. Use when writing code, fixing bugs, or when user mentions tests, TDD, unit tests, integration tests, or testing strategy.
5find-skills
Helps users discover and install agent skills when they ask questions like "how do I do X", "find a skill for X", "is there a skill that can...", or express interest in extending capabilities. This skill should be used when the user is looking for functionality that might exist as an installable skill.
2