Skip to content

Commit

Permalink
build: mark Cargo.lock as binary for merging
Browse files Browse the repository at this point in the history
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`).
  • Loading branch information
arxanas committed Apr 26, 2022
1 parent d52eeb2 commit 9589600
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Cargo.lock merge=binary

0 comments on commit 9589600

Please sign in to comment.