set merge strategy for verify_types.json in .gitattributes (#2713)

jakkdl · web-flow · commit a9a9170a0142 · 2023-07-21T11:06:23.000Z
diff --git a/.gitattributes b/.gitattributes
@@ -2,3 +2,5 @@
 trio/_core/_generated*    linguist-generated=true
 # Treat generated files as binary in git diff
 trio/_core/_generated*    -diff
+# don't merge the generated json file, let the user (script) handle it
+trio/_tests/verify_types.json merge=binary
