Skip to content

Commit f73b839

Browse files
committed
chore: union-merge the append-only ledgers
.dev/optimizations.md and .dev/debt.yaml conflicted on every parallel PR on 2026-10-22 (#85, #86 against #87), always as two sides appending rows. git's union driver resolves exactly that; check_yaml and the ledger gates still validate the result. Smell-audited: 1: merge driver for a recurring mechanical conflict
1 parent ac26be3 commit f73b839

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

‎.gitattributes‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,7 @@
88

99
# Keep read-only historical / generated content out of GitHub's language stats.
1010
docs/ja/archive/** linguist-documentation
11+
# Append-only ledgers: parallel branches each add rows at the end, so a union
12+
# merge is the correct resolution (the YAML and ledger gates still check it).
13+
.dev/optimizations.md merge=union
14+
.dev/debt.yaml merge=union

0 commit comments

Comments
 (0)