Worktrees, merge conflicts and coding agents.

Practical guides to running coding agents in parallel: git worktrees, Claude Code agent teams, Codex, Cursor, GitHub’s merge queue and merge conflicts.

Claude CodeGit worktrees

Merging git worktrees from parallel Claude Code agents

Claude Code’s --worktree flag gives each session its own checkout and branch. Set them up, land the branches, and stop them colliding at merge time.

Read guide
More guides
Claude CodeAgent teams

Claude Code agent teams: landing the pull requests

Agent teams coordinate the work between Claude Code sessions, not the merge. Set a team up, avoid overwrites, and land what it produces.

CodexGit worktrees

Codex worktrees: merging parallel agent branches

Codex runs each chat in its own git worktree so parallel tasks do not interfere. Turn the worktrees into pull requests and land them together.

CursorGit worktrees

Cursor worktrees and cloud agents: landing the pull requests

Cursor runs agents in git worktrees on your machine and in cloud VMs that push branches. See how both work and how to keep the pull requests landing.

GitHubMerge conflicts

“This branch has conflicts that must be resolved”: what it means and how to fix it

GitHub shows this message when a pull request cannot merge cleanly into its base branch. See why it happens, three ways to fix it, and how to see it less.

GitHubMerge queue

GitHub merge queue: how it works and what happens on a conflict

How GitHub’s merge queue orders and tests pull requests, how to enable it, what happens when a queued pull request conflicts, and the alternatives.

CostCoding agents

What merge conflicts cost a team running AI coding agents

Every merge conflict between agent pull requests is paid for in tokens, CI minutes and developer attention. See where the cost comes from and what we measured.