From 5c33ad0aa757e4897c19a401d673a5c1c0d6eb93 Mon Sep 17 00:00:00 2001 From: Denis Bilenko Date: Thu, 5 Mar 2026 15:12:47 +0100 Subject: [PATCH 1/2] Preserve manual .gitattributes entries across genkit regeneration Add .gitattributes.manual for hand-maintained entries (currently the merge=union strategy for NEXT_CHANGELOG.md) and update the generate target to prepend it to the genkit-produced .gitattributes. Co-Authored-By: Claude Sonnet 4.6 --- .gitattributes.manual | 3 +++ Makefile | 1 + 2 files changed, 4 insertions(+) create mode 100644 .gitattributes.manual 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 From cb2799cebd0ea88e190c023d58e98eeb706d4d19 Mon Sep 17 00:00:00 2001 From: Denis Bilenko Date: Thu, 5 Mar 2026 15:14:45 +0100 Subject: [PATCH 2/2] gitattributes: add manual header section and comment separator Co-Authored-By: Claude Sonnet 4.6 --- .gitattributes | 2 ++ 1 file changed, 2 insertions(+) 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