Remove merge=union strategy for NEXT_CHANGELOG.md (#5060)

denik · web-flow · commit 488e86a77cb5 · 2026-04-22T14:16:04.000+02:00
## Changes Revert #4639 Note, I still keep empty .gitattributes.manual in case we need to add something there. ## Why I find my agent-authored PRs to have NEXT_CHANGELOG.md as a union instead of properly resolved one. Since there is no test that tells you that it's wrong (unlike acceptance where we also use union strategy for output files but they will be corrected by next test-update).
diff --git a/.gitattributes b/.gitattributes
@@ -1,5 +1,3 @@
-NEXT_CHANGELOG.md merge=union
-
 # Generated by genkit update-sdk:
 cmd/account/access-control/access-control.go linguist-generated=true
 cmd/account/billable-usage/billable-usage.go linguist-generated=true
diff --git a/.gitattributes.manual b/.gitattributes.manual
@@ -1,3 +1 @@
-NEXT_CHANGELOG.md merge=union
-
 # Generated by genkit update-sdk:

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-NEXT_CHANGELOG.md merge=union`
`2`		`-`
`3`	`1`	`# Generated by genkit update-sdk:`
`4`	`2`	`cmd/account/access-control/access-control.go linguist-generated=true`
`5`	`3`	`cmd/account/billable-usage/billable-usage.go linguist-generated=true`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1 @@`
`1`		`-NEXT_CHANGELOG.md merge=union`
`2`		`-`
`3`	`1`	`# Generated by genkit update-sdk:`