Git worktrees gave each Claude agent its own sandbox. And scattered my sessions.

nickboy@users.noreply.github.com (Nick Liu) — Mon, 13 Jul 2026 00:00:00 +0000

I run four or more Claude Code agents at once, and until recently they all shared one working tree. Two agents editing the same repo means one of them eventually builds against the other's half-finished changes. Git worktrees fix that cleanly. What nobody warned me about is that the fix multiplies a different problem I already had: forgetting which folder a session lives in.

Tested with Claude Code 2.1.x · macOS

The symptom
#

With several agents in one directory, the working tree is shared mutable state. Agent A refactors a partial, agent B runs the build, and B’s “failure” is really A’s work in flight. I had been dodging this by scoping agents to different subdirectories, which works until it does not.

Worktrees on Nick Liu - Software Engineer

Git worktrees gave each Claude agent its own sandbox. And scattered my sessions.

The symptom #

The symptom
#