Let the agent stop a merge for review after substantive conflict fixes

2026-10-15 19:36:42 -07:00
parent a2067c2ba0
commit 55b6a32263
7 changed files with 59 additions and 8 deletions
@@ -8,8 +8,6 @@

 # M4 — Merging and history

- Merge-resolution stage
-  A stage triggered when merging the default branch into a task branch conflicts; its result goes to review.
 - Git notes on squash merges
  Attach a note under `refs/notes/byre` to each squash commit, holding the plan, the handoff bundle, review summaries, eval results and resolved inbox decisions, with full transcripts referenced by task ID. Notes don't push or fetch by default, so the merge pushes the notes ref explicitly and project setup configures fetching it.
 - Repeated merge cycles