Glossary

Conflict negotiation

Conflict negotiation is how CatWrangler settles overlap between agents: clashes are caught at the planning stage before code exists, and again at merge, where compatible edits are combined automatically and anything genuinely in tension is routed back to the right agent to rework.

Where it shows up

It’s how “many agents, one codebase” survives reality: overlap is settled at intent before code exists, and again at merge where compatible edits combine automatically and the rest is routed for rework. No silent overwrites.

This definition is reused verbatim everywhere the term appears.