Skip to content

Commit 25e8d2b

Browse files
committed
chore(gitattributes): union-merge for append-only board files
AGENT_LOG / EPIPHANIES / INTEGRATION_PLANS are PREPEND-ONLY per the CCA2A pattern (CLAUDE.md mandatory board-hygiene rule). When two branches concurrently prepend entries, the right semantic resolution is to keep both — there is no overwrite by construction. Declaring `merge=union` avoids manual conflict resolution on every rebase. https://claude.ai/code/session_017gZ6sPRXYPj5n7uJ7NBtRv
1 parent 169dad8 commit 25e8d2b

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

.gitattributes

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
2+
# Append/prepend-only governance files use union merge so concurrent
3+
# prepends from different branches don't conflict (per CCA2A pattern).
4+
.claude/board/AGENT_LOG.md merge=union
5+
.claude/board/EPIPHANIES.md merge=union
6+
.claude/board/INTEGRATION_PLANS.md merge=union

0 commit comments

Comments
 (0)