Commit b3fc9c7
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_017gZ6sPRXYPj5n7uJ7NBtRv1 parent 5c69845 commit b3fc9c7
1 file changed
Lines changed: 6 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
0 commit comments