guides.
long reads for teams whose developers each run AI coding agents, such as Claude Code, Codex, Cursor and GitHub Copilot, on one repository: how often the agents cause merge conflicts, the clean merges that still break, worktrees and agent teams, and where agentmash fits, which tells an agent before it edits a file that a teammate’s agent changed it.
-
claude code agent teams and agentmash
claude code agent teams split one person’s work on a machine. agentmash warns each agent of other developers’ edits to its file, across machines and tools.
published
-
codex and claude code on one team
codex and claude code on one repo: each agent reports edits and is warned before it edits a file a teammate’s agent changed (codex after /hooks approval).
published
-
how often AI coding agents cause merge conflicts
how often AI coding agents cause merge conflicts, per four studies: 27.67% of replayed unmerged agent pull requests hit a textual conflict with their base.
published
-
multiple claude code instances
multiple claude code instances on a repo: the docs name no cap on terminal sessions, a worktree each, and agentmash flags teammates’ changes before edits.
published
-
prevent agent merge conflicts
how to prevent merge conflicts between AI agents: worktrees, claims, merge-tree, merge queues, and a warning before each edit across teammates’ machines.
published
-
semantic merge conflicts
a semantic merge conflict is a clean git merge that breaks the code: four cases from teammates’ coding agents, a stale-read revert, and what catches each.
published
-
the github copilot app and agentmash
the github copilot app runs parallel agents in worktrees. agentmash warns the copilot cli, claude code and cursor of teammates’ edits, across machines.
published
-
claude code and cursor on one team
claude code and cursor together on one repo: each agent is told before it edits a file a teammate’s agent changed, cursor’s as a refused first edit.
published · updated
-
claude code for teams
claude code for teams: what to commit, what stays personal, and how each developer’s agent is told what teammates’ agents change before it edits.
published · updated
-
git worktrees and agentmash
worktrees keep your agents out of each other’s files. they don’t tell your agent what a teammate’s agent changed. why teams running claude code use both.
published · updated
-
glossary
multi-agent coding terms: git worktree, semantic merge conflict, merge skew, merge queue, advisory lock, intent conflict, and agentmash’s room and claim.