Worktree Management

Git Worktree Management

git worktreeを使用した並列開発環境の管理。

Architecture

Each worktree gets isolated Docker resources:

workspace/
├── dotfiles/              # main branch
│   └── Container: dotfiles-dotfiles
├── dotfiles-feature-xyz/  # feature/xyz branch
│   └── Container: dotfiles-dotfiles-feature-xyz
└── dotfiles-fix-bug/      # fix/bug branch
    └── Container: dotfiles-dotfiles-fix-bug

Common Operations

Create New Worktree

# From dotfiles directory
git worktree add ../dotfiles-feature-xyz feature/xyz

# Move to new worktree
cd ../dotfiles-feature-xyz

# Build Docker environment
make build
make shell

Create from Existing Branch

git worktree add ../dotfiles-existing existing-branch

List Worktrees

git worktree list

Delete Worktree

# Clean Docker resources first
cd ../dotfiles-feature-xyz
make clean

# Remove worktree
cd ../dotfiles
git worktree remove ../dotfiles-feature-xyz

# Force remove if needed
git worktree remove --force ../dotfiles-feature-xyz

Switch Between Worktrees

Simply change directory:

cd ../dotfiles-feature-xyz
make shell  # Enter this worktree's container

Naming Convention

Use descriptive names:

# Good
git worktree add ../dotfiles-feature-vim-config feature/vim-config
git worktree add ../dotfiles-fix-tmux-colors fix/tmux-colors

# Bad
git worktree add ../test test-branch

Cleanup

Remove Single Worktree

cd worktree-dir
make clean                    # Remove Docker resources
cd ..
git worktree remove worktree-dir

Check All Containers

make list  # Works from any worktree

Remove All Docker Resources

make clean-all  # Removes all dotfiles containers

Troubleshooting

Cannot Delete Worktree

git worktree remove --force ../worktree-dir
# Or manually:
rm -rf ../worktree-dir
git worktree prune

Branch Already Checked Out

Each branch can only be checked out in one worktree. Use a different branch or remove the existing worktree first.