ai/byre
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 6 Wiki Activity

Drop the Repeated merge cycles TODO item

Browse Source
This commit is contained in:
Ian Gulliver
2026-10-15 19:45:27 -07:00
parent 6741177f53
commit 2899a8fcdc
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TODO.md
-2
View File
@@ -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.