worktrees
Git conflicts and dirty worktrees with AI coding agents: what Aider, Claude Code, and Codex actually do
Aider 0.86.2 commits dirty changes, Claude Code 2.1.292 snapshots files, and Codex CLI 0.160.1 isolates parallel work in Git worktrees.
Git worktrees keep agents apart until the merge
Git worktrees give agents separate files and indexes, but divergent branches can still conflict when they are merged.