From 4948f631d1d9eaac0875ce6db87f6cdf52e76de2 Mon Sep 17 00:00:00 2001 From: Waleed Khan Date: Mon, 25 Apr 2022 22:42:32 -0700 Subject: [PATCH] build: mark `Cargo.lock` as `binary` for merging Otherwise, Git tries to resolve the conflict textually and introduces conflict markers, which make `cargo` unable to process the file (and therefore unable to resolve the conflicts automatically, such as with `cargo update`). --- .gitattributes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index af4fe8b58..08d355840 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,2 @@ -flake.lock linguist-generated=true +Cargo.lock linguist-generated=true merge=binary +flake.lock linguist-generated=true merge=binary