Worktrees: Isolated Agent Workspaces

Git worktrees let you run multiple Claude Code sessions on the same repo without stepping on each other's diffs. They're the underrated unlock for parallel agent work.

9 min · Reviewed 2026

What worktrees solve

Two Claude Code sessions in the same checkout will fight. They both see the same files, both edit them, and your diff becomes a salad. Worktrees give each session its own working directory backed by the same git repo, so each can have its own branch and its own state without conflict.

The basic move

# From your main checkout
git worktree add ../my-project-feat-auth feat-auth
git worktree add ../my-project-refactor-api refactor-api

# Run a Claude session in each
(cd ../my-project-feat-auth && claude)
(cd ../my-project-refactor-api && claude)

# When done
git worktree remove ../my-project-feat-authEach worktree is a separate folder backed by the same repo. Clean up when the work merges.

Where worktrees shine

Two features in flight, two agents progressing each one
Spawning a 'spike' agent on an experimental branch while you keep working on main
Reviewing a teammate's PR with an agent without leaving your active branch
Hot-fix on top of a long-running refactor, neither blocking the other
Trying three different approaches to the same problem, one per worktree

Apply: spin up one parallel session

Pick a feature branch you're partway through
Create a worktree on a different branch
Run a separate Claude Code session in it
Make sure both sessions are working on truly independent files
Merge or remove the worktree when the work lands

The big idea: one agent, one worktree. The git worktree command turns chaotic parallelism into clean parallelism.

End-of-lesson check

15 questions · take it digitally for instant feedback at tendril.neural-forge.io/learn/quiz/end-claude-code-worktrees-creators

What is the core idea behind "Worktrees: Isolated Agent Workspaces"?
1. Git worktrees let you run multiple Claude Code sessions on the same repo without stepping on each other's diffs. They're the underrated unlock for parallel agent work.
2. Move personal/secret entries to local settings
3. Long codebase searches that would otherwise block the session for minutes
4. Plugin-scoped: shipped by official or third-party plugins, prefixed with the plu…
Which term best describes a foundational idea in "Worktrees: Isolated Agent Workspaces"?
1. branch isolation
2. worktree
3. parallel session
4. agent sandbox
A learner studying Worktrees: Isolated Agent Workspaces would need to understand which concept?
1. worktree
2. parallel session
3. branch isolation
4. agent sandbox
Which of these is directly relevant to Worktrees: Isolated Agent Workspaces?
1. worktree
2. branch isolation
3. agent sandbox
4. parallel session
Which of the following is a key point about Worktrees: Isolated Agent Workspaces?
1. Two features in flight, two agents progressing each one
2. Spawning a 'spike' agent on an experimental branch while you keep working on main
3. Reviewing a teammate's PR with an agent without leaving your active branch
4. Hot-fix on top of a long-running refactor, neither blocking the other
Which of these does NOT belong in a discussion of Worktrees: Isolated Agent Workspaces?
1. Two features in flight, two agents progressing each one
2. Spawning a 'spike' agent on an experimental branch while you keep working on main
3. Reviewing a teammate's PR with an agent without leaving your active branch
4. Move personal/secret entries to local settings
Which statement is accurate regarding Worktrees: Isolated Agent Workspaces?
1. Create a worktree on a different branch
2. Run a separate Claude Code session in it
3. Pick a feature branch you're partway through
4. Make sure both sessions are working on truly independent files
Which of these does NOT belong in a discussion of Worktrees: Isolated Agent Workspaces?
1. Create a worktree on a different branch
2. Run a separate Claude Code session in it
3. Pick a feature branch you're partway through
4. Move personal/secret entries to local settings
What is the key insight about "One agent, one worktree" in the context of Worktrees: Isolated Agent Workspaces?
1. The discipline: any non-trivial parallel agent work goes in its own worktree.
2. Move personal/secret entries to local settings
3. Long codebase searches that would otherwise block the session for minutes
4. Plugin-scoped: shipped by official or third-party plugins, prefixed with the plu…
What is the key insight about "Watch shared infrastructure" in the context of Worktrees: Isolated Agent Workspaces?
1. Move personal/secret entries to local settings
2. Worktrees share node_modules and other ignored state by default in some setups.
3. Long codebase searches that would otherwise block the session for minutes
4. Plugin-scoped: shipped by official or third-party plugins, prefixed with the plu…
What is the key insight about "From the community" in the context of Worktrees: Isolated Agent Workspaces?
1. Move personal/secret entries to local settings
2. Long codebase searches that would otherwise block the session for minutes
3. On r/ClaudeAI, the worktree+Claude Code combo is one of the most-shared productivity patterns of 2026 — incident.
4. Plugin-scoped: shipped by official or third-party plugins, prefixed with the plu…
Which statement accurately describes an aspect of Worktrees: Isolated Agent Workspaces?
1. Move personal/secret entries to local settings
2. Long codebase searches that would otherwise block the session for minutes
3. Plugin-scoped: shipped by official or third-party plugins, prefixed with the plu…
4. Two Claude Code sessions in the same checkout will fight. They both see the same files, both edit them, and your diff becomes a salad.
What does working with Worktrees: Isolated Agent Workspaces typically involve?
1. The big idea: one agent, one worktree. The git worktree command turns chaotic parallelism into clean parallelism.
2. Move personal/secret entries to local settings
3. Long codebase searches that would otherwise block the session for minutes
4. Plugin-scoped: shipped by official or third-party plugins, prefixed with the plu…
Which best describes the scope of "Worktrees: Isolated Agent Workspaces"?
1. It is unrelated to tools workflows
2. It focuses on Git worktrees let you run multiple Claude Code sessions on the same repo without stepping on each ot
3. It applies only to the opposite beginner tier
4. It was deprecated in 2024 and no longer relevant
Which section heading best belongs in a lesson about Worktrees: Isolated Agent Workspaces?
1. Move personal/secret entries to local settings
2. Long codebase searches that would otherwise block the session for minutes
3. The basic move
4. Plugin-scoped: shipped by official or third-party plugins, prefixed with the plu…

← Back to interactive lesson

Tendril · Creators · Tools Literacy

Worktrees: Isolated Agent Workspaces

Git worktrees let you run multiple Claude Code sessions on the same repo without stepping on each other's diffs. They're the underrated unlock for parallel agent work.

9 min · Reviewed 2026

What worktrees solve

The basic move

# From your main checkout
git worktree add ../my-project-feat-auth feat-auth
git worktree add ../my-project-refactor-api refactor-api

# Run a Claude session in each
(cd ../my-project-feat-auth && claude)
(cd ../my-project-refactor-api && claude)

# When done
git worktree remove ../my-project-feat-authEach worktree is a separate folder backed by the same repo. Clean up when the work merges.

Where worktrees shine

Two features in flight, two agents progressing each one
Spawning a 'spike' agent on an experimental branch while you keep working on main
Reviewing a teammate's PR with an agent without leaving your active branch
Hot-fix on top of a long-running refactor, neither blocking the other
Trying three different approaches to the same problem, one per worktree

Apply: spin up one parallel session

Pick a feature branch you're partway through
Create a worktree on a different branch
Run a separate Claude Code session in it
Make sure both sessions are working on truly independent files
Merge or remove the worktree when the work lands

The big idea: one agent, one worktree. The git worktree command turns chaotic parallelism into clean parallelism.

End-of-lesson check

15 questions · take it digitally for instant feedback at tendril.neural-forge.io/learn/quiz/end-claude-code-worktrees-creators

What is the core idea behind "Worktrees: Isolated Agent Workspaces"?
1. Git worktrees let you run multiple Claude Code sessions on the same repo without stepping on each other's diffs. They're the underrated unlock for parallel agent work.
2. Move personal/secret entries to local settings
3. Long codebase searches that would otherwise block the session for minutes
4. Plugin-scoped: shipped by official or third-party plugins, prefixed with the plu…
Which term best describes a foundational idea in "Worktrees: Isolated Agent Workspaces"?
1. branch isolation
2. worktree
3. parallel session
4. agent sandbox
A learner studying Worktrees: Isolated Agent Workspaces would need to understand which concept?
1. worktree
2. parallel session
3. branch isolation
4. agent sandbox
Which of these is directly relevant to Worktrees: Isolated Agent Workspaces?
1. worktree
2. branch isolation
3. agent sandbox
4. parallel session
Which of the following is a key point about Worktrees: Isolated Agent Workspaces?
1. Two features in flight, two agents progressing each one
2. Spawning a 'spike' agent on an experimental branch while you keep working on main
3. Reviewing a teammate's PR with an agent without leaving your active branch
4. Hot-fix on top of a long-running refactor, neither blocking the other
Which of these does NOT belong in a discussion of Worktrees: Isolated Agent Workspaces?
1. Two features in flight, two agents progressing each one
2. Spawning a 'spike' agent on an experimental branch while you keep working on main
3. Reviewing a teammate's PR with an agent without leaving your active branch
4. Move personal/secret entries to local settings
Which statement is accurate regarding Worktrees: Isolated Agent Workspaces?
1. Create a worktree on a different branch
2. Run a separate Claude Code session in it
3. Pick a feature branch you're partway through
4. Make sure both sessions are working on truly independent files
Which of these does NOT belong in a discussion of Worktrees: Isolated Agent Workspaces?
1. Create a worktree on a different branch
2. Run a separate Claude Code session in it
3. Pick a feature branch you're partway through
4. Move personal/secret entries to local settings
What is the key insight about "One agent, one worktree" in the context of Worktrees: Isolated Agent Workspaces?
1. The discipline: any non-trivial parallel agent work goes in its own worktree.
2. Move personal/secret entries to local settings
3. Long codebase searches that would otherwise block the session for minutes
4. Plugin-scoped: shipped by official or third-party plugins, prefixed with the plu…
What is the key insight about "Watch shared infrastructure" in the context of Worktrees: Isolated Agent Workspaces?
1. Move personal/secret entries to local settings
2. Worktrees share node_modules and other ignored state by default in some setups.
3. Long codebase searches that would otherwise block the session for minutes
4. Plugin-scoped: shipped by official or third-party plugins, prefixed with the plu…
What is the key insight about "From the community" in the context of Worktrees: Isolated Agent Workspaces?
1. Move personal/secret entries to local settings
2. Long codebase searches that would otherwise block the session for minutes
3. On r/ClaudeAI, the worktree+Claude Code combo is one of the most-shared productivity patterns of 2026 — incident.
4. Plugin-scoped: shipped by official or third-party plugins, prefixed with the plu…
Which statement accurately describes an aspect of Worktrees: Isolated Agent Workspaces?
1. Move personal/secret entries to local settings
2. Long codebase searches that would otherwise block the session for minutes
3. Plugin-scoped: shipped by official or third-party plugins, prefixed with the plu…
4. Two Claude Code sessions in the same checkout will fight. They both see the same files, both edit them, and your diff becomes a salad.
What does working with Worktrees: Isolated Agent Workspaces typically involve?
1. The big idea: one agent, one worktree. The git worktree command turns chaotic parallelism into clean parallelism.
2. Move personal/secret entries to local settings
3. Long codebase searches that would otherwise block the session for minutes
4. Plugin-scoped: shipped by official or third-party plugins, prefixed with the plu…
Which best describes the scope of "Worktrees: Isolated Agent Workspaces"?
1. It is unrelated to tools workflows
2. It focuses on Git worktrees let you run multiple Claude Code sessions on the same repo without stepping on each ot
3. It applies only to the opposite beginner tier
4. It was deprecated in 2024 and no longer relevant
Which section heading best belongs in a lesson about Worktrees: Isolated Agent Workspaces?
1. Move personal/secret entries to local settings
2. Long codebase searches that would otherwise block the session for minutes
3. The basic move
4. Plugin-scoped: shipped by official or third-party plugins, prefixed with the plu…

← Back to interactive lesson