From f61e29a6e3091371b39218abacb773a0595698f1 Mon Sep 17 00:00:00 2001 From: jakkdl Date: Fri, 21 Jul 2023 12:48:28 +0200 Subject: [PATCH] set merge strategy for verify_types.json in .gitattributes --- .gitattributes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitattributes b/.gitattributes index 991065e069..7fbcb4fe2d 100644 --- 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