Started May 3 · 12:00·Sonnet 4.6
LN
Leonel Ngoya17:00
Some teams squash, some rebase, some merge with --no-ff. Pick one for our repo and justify it.
AxiomSonnet 4.617:05
**Squash-and-merge to main, rebase locally, never merge.**
Reasoning:
1. Each PR becomes one atomic commit on main → bisect is trivial.
2. Local rebase keeps your branch readable while you iterate.
3. Banning merge commits means main is a clean linear sequence — far easier for release notes and reverts.
The one downside: you lose the per-commit history once the PR is squashed. Mitigate by linking the PR in every squash message.
Demo template — no model is invoked. Replies are randomly picked from a small list of fake responses in mock-data/axiom.ts.