Merge TODO.md with git's union merge (closes #98) #100

Merged
clawbot merged 1 commits from issue-98-todo-merge-union into next 2026-10-04 14:14:52 +02:00
1 Commits
Author SHA1 Message Date
sneak cfef3633f9 Merge TODO.md with git's union merge (closes #98)
check / check (push) Waiting to run
Every PR adds an entry at the top of Completed Steps in TODO.md, so each
merge to next left every other open PR conflicting there. A root
.gitattributes now marks TODO.md merge=union, so two branches inserting
at the same place merge without a conflict.

Git now never reports a conflict in TODO.md: a real conflict elsewhere
keeps both versions of the line, and two new entries that share an
identical line end up one inside the other. The .gitattributes comment
and the TODO.md entry say to read the merged entries after every merge
or rebase.

This applies to this repository only; nothing canonical changes.

Model: opus-5-5
2026-10-04 11:49:31 +00:00