From 2899a8fcdc68bb659ed3fabc0af1db569d97d871 Mon Sep 17 00:00:00 2001 From: Ian Gulliver Date: Thu, 15 Oct 2026 19:45:27 -0700 Subject: [PATCH] Drop the Repeated merge cycles TODO item --- TODO.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/TODO.md b/TODO.md index feb6f31..4a07a17 100644 --- a/TODO.md +++ b/TODO.md @@ -8,8 +8,6 @@ # M4 — Merging and history -- 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 Search closed tasks across transcripts, artifacts and decisions.