Agree how 2 agent users share one trunk

Judgment callHard20 minAnthropic and Shopify style

Your task

Your team practices trunk-based development on a Python service, merging to main several times a day. This sprint, you and a teammate both use AI agents on overlapping parts of the codebase. Twice this week, one person's agent quietly undid the other's change during a "cleanup", and both merges were clean.

Design the working agreement that lets you both commit fast to the same trunk. What is different about this compared with 2 people coding by hand?

It covers

  • Merge coordination
  • Handoff context