From 6dcd401fb5dcec40fa30a8a011f52ffed47a75d0 Mon Sep 17 00:00:00 2001 From: Jakob Wennberg Date: Wed, 5 Aug 2026 14:03:19 +0200 Subject: [PATCH] chore: union-merge DECISIONS.md to stop phantom-green conflicting PRs (#1351) 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 Co-authored-by: Claude Fable 5 --- .gitattributes | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.gitattributes b/.gitattributes index 6672a4ff..3410ff38 100644 --- a/.gitattributes +++ b/.gitattributes @@ -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