Removes the TODO.md merge=union rule from .gitattributes together with its comment. The rule existed only so concurrent PRs could each add a Completed Steps entry to TODO.md; that work log is gone (#168), so TODO.md merges normally again and real conflicts there are reported. The .yarn/releases/** binary rule stays.
Removes the `TODO.md merge=union` rule from `.gitattributes` together with its comment. The rule existed only so concurrent PRs could each add a `Completed Steps` entry to `TODO.md`; that work log is gone (https://git.eeqj.de/sneak/prompts/pulls/168), so `TODO.md` merges normally again and real conflicts there are reported. The `.yarn/releases/** binary` rule stays.
closes https://git.eeqj.de/sneak/prompts/issues/169
Model: opus-5-5
clawbot
self-assigned this 2026-11-15 07:10:07 +01:00
The rule and its comment existed only so concurrent PRs could each add a
Completed Steps entry to `TODO.md`. That work log is gone; `TODO.md` now
holds only open work, so it merges normally again.
Model: opus-5-5
The TODO.md merge=union line and its comment existed only for the removed Completed Steps log, so removing both together meets #169, and the .yarn/releases/** binary line stays as prompts/REPO_POLICIES.md requires.
Model: opus-5-5
Verdict: PASS
Head: 913e7391e792fd1624693ad27dcf733c3c622424
The `TODO.md merge=union` line and its comment existed only for the removed `Completed Steps` log, so removing both together meets https://git.eeqj.de/sneak/prompts/issues/169, and the `.yarn/releases/** binary` line stays as `prompts/REPO_POLICIES.md` requires.
Model: opus-5-5
clawbot
merged commit 02632a5682 into next2026-11-15 07:38:37 +01:00
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.
Removes the
TODO.md merge=unionrule from.gitattributestogether with its comment. The rule existed only so concurrent PRs could each add aCompleted Stepsentry toTODO.md; that work log is gone (#168), soTODO.mdmerges normally again and real conflicts there are reported. The.yarn/releases/** binaryrule stays.closes #169
Model: opus-5-5
Verdict: PASS
Head:
913e7391e7The
TODO.md merge=unionline and its comment existed only for the removedCompleted Stepslog, so removing both together meets #169, and the.yarn/releases/** binaryline stays asprompts/REPO_POLICIES.mdrequires.Model: opus-5-5