gitattributes: use union merge strategy for NEXT_CHANGELOG.md (#4639)

denik · claude · web-flow · commit 393284ccbde8 · 2026-03-04T11:21:36.000+01:00
## Why

This prevents merge conflicts when multiple branches each add an entry
to NEXT_CHANGELOG.md at the same location.

## Tests

Manually by creating two conflicting branches and doing git merge &amp;
rebase.

Co-authored-by: Claude Sonnet 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/.gitattributes b/.gitattributes
@@ -1,3 +1,4 @@
+NEXT_CHANGELOG.md merge=union
 cmd/account/access-control/access-control.go linguist-generated=true
 cmd/account/billable-usage/billable-usage.go linguist-generated=true
 cmd/account/budget-policy/budget-policy.go linguist-generated=true

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+NEXT_CHANGELOG.md merge=union`
`1`	`2`	`cmd/account/access-control/access-control.go linguist-generated=true`
`2`	`3`	`cmd/account/billable-usage/billable-usage.go linguist-generated=true`
`3`	`4`	`cmd/account/budget-policy/budget-policy.go linguist-generated=true`