sneak/prompts
1
0 Fork 0
Code Issues 6 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Drop the TODO.md union-merge rule (closes #169) #170

Merged
clawbot merged 1 commits from issue-169-drop-todo-union-merge into next 2026-11-15 07:38:37 +01:00
Conversation 1 Commits 1 Files Changed 1
-5
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitattributes
-5
View File
@@ -1,7 +1,2 @@
# 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
# yarn's release file is one opaque file in diffs and merges. # yarn's release file is one opaque file in diffs and merges.
.yarn/releases/** binary .yarn/releases/** binary