From 67a168a1e282a8755da337d2227cdd3b0d9b13be Mon Sep 17 00:00:00 2001
From: Hamid Zare <12127420+hamidzr@users.noreply.github.com>
Date: Wed, 13 Nov 2024 15:19:53 -0800
Subject: [PATCH] chore: enable merge flag for generated bindings (#10082)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

👋
---
 .gitattributes | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 4565e037acb..6384a22a297 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,11 +3,11 @@
 
 # ignore generated code for cli diffs and merges. treat as binary.
 # ignore generated code for GitHub UIs.
-proto/pkg/**/*    -diff -merge linguist-generated=true
-master/pkg/schemas/expconf/zgen_*    -diff -merge linguist-generated=true
-webui/react/src/services/api-ts-sdk/**/*    -diff -merge linguist-generated=true
-webui/react/src/services/stream/wire.ts    -diff -merge linguist-generated=true
-harness/determined/common/api/bindings.py    -diff -merge linguist-generated=true
-harness/determined/common/streams/wire.py    -diff -merge linguist-generated=true
-docs/swagger-ui/swagger-ui*js*    -diff -merge
+proto/pkg/**/*    -diff linguist-generated=true
+master/pkg/schemas/expconf/zgen_*    -diff linguist-generated=true
+webui/react/src/services/api-ts-sdk/**/*    -diff linguist-generated=true
+webui/react/src/services/stream/wire.ts    -diff linguist-generated=true
+harness/determined/common/api/bindings.py    -diff linguist-generated=true
+harness/determined/common/streams/wire.py    -diff linguist-generated=true
+docs/swagger-ui/swagger-ui*js*    -diff
 docs/swagger-ui/swagger-ui-main* diff merge