sax3l/accounted
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

chore: union-merge DECISIONS.md to stop phantom-green conflicting PRs (#1351)

Browse Source 
Every concurrent PR appends to DECISIONS.md, so any two of them conflict
at EOF. The real damage is not the conflict: GitHub runs no Actions on a
conflicting PR, so `gh pr checks` shows a short all-pass list that reads
as green when the test suite never ran. Union merge keeps both sides,
which is the correct semantics for an append-only log with no ordering
contract beyond the date prefix.

Co-authored-by: Jakob Wennberg <jakob.wennberg@gmail.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Jakob Wennberg
2026-08-05 14:03:19 +02:00
committed by GitHub
parent af9db54405
commit 6dcd401fb5
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitattributes
+8
View File
@@ -18,3 +18,11 @@ lib/bokslut/ixbrl/taxonomy/generated/*.json text eol=lf linguist-generated=true
# the working tree matches what the generators write.
lib/extensions/_generated/** text eol=lf linguist-generated=true
*.snap text eol=lf linguist-generated=true
# DECISIONS.md is an append-only log that every concurrent PR writes to, so
# two PRs touching it always conflict at EOF. That is worse than it sounds:
# GitHub runs ZERO Actions on a conflicting PR, so `gh pr checks` returns a
# short all-pass list that looks green while nothing actually ran. A union
# merge keeps both sides' lines (the file has no ordering contract beyond
# the date prefix), which is exactly the right semantics for an append log.
DECISIONS.md merge=union