Git-command chain hygiene (#33,#34,#35) (#63)

Co-authored-by: claude <claude@jpaul.io> Co-committed-by: claude <claude@jpaul.io>
2026-06-22 17:06:58 -04:00
parent c34052665f
commit 6d28567c12
4 changed files with 33 additions and 15 deletions
@@ -190,7 +190,7 @@ The pattern is **fan-out, then fan-in through the front door, one branch at a ti
   first pass that lets you spend your scarce review attention only on PRs that already build and pass
   tests. CI reviews *all* of them in parallel for free; you review the survivors.
 3. **You merge them into `main` in a deliberate order**, not finish-order. Merge the foundational one
-   first (the agent that touched the joint), then rebase/merge the others on top so any conflict
+   first (the agent that touched the joint), then merge the others on top so any conflict
   surfaces against settled code. Each merge is a small, calm, Module-6 conflict resolution — on your
   terms, once, instead of two live agents corrupting each other in real time.
 4. **An assistive reviewer (Module 24) can take the first pass** on each PR — comment on the obvious