Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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`).
- Loading branch information