miniblog.

Wilfred Hughes

Sep 15, 2018 at 11:04

The latest version of Rust can automatically fix lockfiles that have merge conflicts in them: https://github.com/rust-lang/cargo/pull/5831/ This is often possible with machine generated files, but it's rare to see in practice. Super convenient though.

cargo can silently fix some bad lockfiles (use --locked to disable) by Eh2406 · Pull Request #5831 · rust-lang/cargo

Lock files often get corrupted by git merge. This makes all cargo commands silently fix that kind of corruption. If you want to be sure that your CI does not change the lock file you have commited ...