diff --git a/.gitattributes b/.gitattributes
index e10f44c0ec..6de2907403 100755
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,6 @@
 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
 cmd/account/budget-policy/budget-policy.go linguist-generated=true
diff --git a/.gitattributes.manual b/.gitattributes.manual
new file mode 100644
index 0000000000..4d8da53399
--- /dev/null
+++ b/.gitattributes.manual
@@ -0,0 +1,3 @@
+NEXT_CHANGELOG.md merge=union
+
+# Generated by genkit update-sdk:
diff --git a/Makefile b/Makefile
index 79d42f448d..628084d07f 100644
--- a/Makefile
+++ b/Makefile
@@ -181,6 +181,7 @@ generate:
 	cd $(UNIVERSE_DIR) && bazel build //openapi/genkit
 	@echo "Generating CLI code..."
 	$(GENKIT_BINARY) update-sdk
+	cat .gitattributes.manual .gitattributes > .gitattributes.tmp && mv .gitattributes.tmp .gitattributes
 	@echo "Updating direct engine config..."
 	make generate-direct