From d26453a3f8d875ffd7c0546d9795715e71d81e9e Mon Sep 17 00:00:00 2001 From: yoav-steinberg Date: Tue, 25 Jan 2022 12:24:06 +0200 Subject: [PATCH] Fix commands.c build issue on merge (#10172) Set commands.c's merge driver to binary so when it conflicts during a merge git will leave the local version unmodified. This way our Makefile will rebuild it based on src/commands/*.json before trying to compile it. Otherwise the file gets modified with merge conflict markers and gets the same timestamp as the *.json files, so the Makefile doesn't attempt to rebuild it before compiling and we get a compilation error. --- .gitattributes | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..697a900cf --- /dev/null +++ b/.gitattributes @@ -0,0 +1,6 @@ +# We set commands.c's merge driver to `binary` so when it conflicts during a +# merge git will leave the local version unmodified. This way our Makefile +# will rebuild it based on src/commands/*.json before trying to compile it. +# Otherwise the file gets modified and gets the same timestamp as the .json +# files. So the Makefile doesn't attempt to rebuild it before compiling. +src/commands.c merge=binary