🌿 Git Worktree — Safe Experimentation

Git Worktree = A Safe Space to Experiment

Ever been editing code and thought “I messed something up”? You try to undo, but can’t remember how far back the changes go. Worried you might break the original. We’ve all been there.

Git Worktree solves this cleanly. Keep your original code untouched, create a completely independent copy alongside it, and experiment there freely.

Think of it like a model home. Your actual home (the original) stays untouched, while you build a model home (worktree) right next door to try new interior designs, wallpaper, furniture arrangements. Like it? Apply it to your real home. Don’t like it? Demolish the model home. Done.

Why Do You Need Worktree?

“Can’t I just create a branch?” Yes, branches work for experiments too. But Worktree is much more convenient in several ways.

Branch Switching vs Worktree

Creating a Worktree — One Line with /worktree

In Claude Code, creating a Worktree is incredibly easy. One slash command.

Method 1: Claude Code Slash Command (Easiest)

/worktree

Claude Code automatically creates a new branch, generates the worktree folder, and navigates to it. One line, done.

Method 2: Direct Git Commands

If you prefer doing it manually without the slash command:

# Create new worktree in parent folder
git worktree add ../my-experiment feat/new-feature

# Explanation:
# ../my-experiment  → folder path for the worktree
# feat/new-feature  → new branch name

# Move to worktree folder
cd ../my-experiment

# Work freely here!
# Completely independent from the original folder.

Full Workflow — 4 Steps

Management Commands — All You Need

git worktree list

# Example output:
# /home/user/my-project       abc1234 [main]
# /home/user/my-experiment    def5678 [feat/new-feature]

When You Like the Result — Merge

# 1. Commit changes in worktree
cd ../my-experiment
git add .
git commit -m "New feature complete"

# 2. Go back to original folder and merge
cd ../my-project
git merge feat/new-feature

# 3. Clean up worktree
git worktree remove ../my-experiment
git branch -d feat/new-feature

When You Don’t Like It — Delete

# Delete worktree (folder also deleted)
git worktree remove ../my-experiment

# Delete branch too (optional)
git branch -D feat/new-feature

# Done! Original is completely unchanged.

Combining with Agent Teams

Worktree’s real power shows when combined with Agent Teams. Agent Teams let Claude Code create multiple “team members (agents)” that work simultaneously.

The problem is that multiple agents working in the same folder simultaneously can overwrite files or cause conflicts. Like 3 chefs using one cutting board at the same time. Dangerous.

So Agent Teams give each agent their own worktree. Each chef gets their own cutting board. Work independently, then combine results when done.

How Agent Teams + Worktree Works

Build 3 pages for our project simultaneously.

1. Homepage - hero section + intro + CTA
2. Services page - 3 service cards layout
3. Team page - team member profile grid

Work independently and merge when done.

Give this instruction and Claude Code auto-creates 3 worktrees, 3 agents work simultaneously, then merges results. You just review the final output.

Try It Yourself

Create a Worktree yourself. If you have git installed and a git-managed project, you can start right away.

# Run in your existing project folder
git worktree add ../my-test-experiment test/experiment

# Verify
git worktree list

# Navigate to worktree folder
cd ../my-test-experiment

# Modify any file
echo "Experimenting!" > test-file.txt

# Commit
git add .
git commit -m "Worktree experiment"

# Go back to original folder
cd ../my-project

# test-file.txt is not here! Original is safe.
ls test-file.txt
# File not found!

# Method 1: Slash command
/worktree

# Method 2: Plain English
Create a worktree to experiment with a new feature.
I want to try changing the homepage design to a blue theme.
Be bold since we can just delete if I don't like it.

I like the blue theme from the worktree.
Merge it into the original project.
And clean up the worktree.

Verification Checklist

Tips + Precautions

Useful tips and precautions for real-world Worktree usage.

# Good names (clear purpose)
git worktree add ../mk-login-page feat/login
git worktree add ../mk-bug-fix-123 fix/issue-123
git worktree add ../mk-redesign feat/redesign

# Bad names (unclear)
git worktree add ../test1 branch1
git worktree add ../temp branch2

git worktree add ../my-experiment feat/experiment
cd ../my-experiment
npm install   # Do this first!
npm run dev

Push the feature from the worktree as a PR.
I want to get a review before merging.