Attach a refs/notes/byre note to each squash merge and push it
This commit is contained in:
@@ -8,8 +8,6 @@
|
||||
|
||||
# M4 — Merging and history
|
||||
|
||||
- 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
|
||||
Let a task merge more than once. After the squash commit lands, reset the task branch to the new default-branch head, since squash commits leave the agent's commits as non-ancestors and later cycles would accumulate spurious conflicts (the per-turn history stays reachable through snapshot refs). Then tell the agent explicitly that its branch was squashed and reset, so it doesn't try to repair history, and resume it; files on disk don't change. Test this per vendor.
|
||||
- Archive search
|
||||
|
||||
Reference in New Issue
Block a user