The git-mp workflow
A way of working so that we build better software.
- Everything is a Change. Features, Bug fixes, Deploys, Re-architectures etc.
- Each Change has a "state". For example backlog, discussion, building, QA, closed.
- A single mainline branch represents current state of things. This can be called trunk / develop.
- Actors (people, AI, CI/CD, integrations, tools) each work on branches other than trunk.
- Things are squash merged to trunk when a Change moves to a new state.
Catch-all
Every idea, bug or request lands here as a change. Nothing is lost; nothing is committed to yet.
Agents: open changes automatically from helpdesk tickets, Sentry alerts and webhooks.
5xx on /login spiked to 38% — page on-call.
Send login OTPs over both SMS and WhatsApp.
Spec & vote
People debate and refine on a discussion branch. Gerrit-style votes gate it: it cannot move on until it clears the bar.
Agents: surface corner cases, draft the spec, and vote like any reviewer.
Scope: v1 is phone-based login only.
What happens if the OTP SMS never arrives?
Colorblind users need more than color on the buttons.
votes reach +2 → state: building
Code, test, ship
Coding, tests, migrations and deploys happen on a build branch, squash-merged to trunk when the state advances.
Agents: implement, run CI/CD, apply migrations and push drafts for review.
+ retry with 30s backoff, fall back SMS→WhatsApp
build passed on push a1b2c3
+ test: expired OTP is rejected after 5 min
🚀 shipped to production (v5.3.0)
Black-box check
Final black-box verification on a production-like environment before the change is trusted.
Agents: run end-to-end suites and write pass/fail status back to the CI ref.
Wrong OTP 3× locks the account, as spec’d.
No regressions across 40 existing flows.
Screen reader announces the OTP field.
Verified on iOS 16 + Android 12 keyboards.
Done
The change is shipped and recorded. Trunk holds only the major state changes; the detail lives in its branches and history.
Agents: archive, link follow-ups and keep docs and SOPs in sync.
✅ QA signs off → owner closes
docs: Log in with a one-time code