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

Every PR adds an entry at the top of Completed Steps in TODO.md, so each merge to next left the other open PRs conflicting there. A root .gitattributes, copied from sneak/prompts, marks TODO.md merge=union: two branches that each add an entry at the same place merge without a conflict and keep both. Git then never reports a conflict in TODO.md, so the Workflow now says to read the merged entries after every merge or rebase. Model: opus-5-5
2026-10-04 17:58:41 +02:00
parent 04093f53ad
commit f8c437b83f
2 changed files with 14 additions and 0 deletions
@@ -0,0 +1,4 @@
+# Every PR adds an entry at the top of TODO.md's Completed Steps; union keeps
+# both sides instead of conflicting. Git never reports a conflict here: read
+# the merged entries after every merge or rebase.
+TODO.md merge=union