linutil/cargo-lock-merge.txt

mirror of https://github.com/ChrisTitusTech/linutil.git synced 2024-11-05 21:28:48 +00:00
What to do when you have a Cargo.lock merge conflict?
1. `git checkout origin/main -- Cargo.lock` to get the original Cargo.lock
2. `cargo build` to update Cargo.lock
3. `git add Cargo.lock`
4. continue the merge as normal
cargo lock policies 2024-09-10 22:08:05 +01:00			`What to do when you have a Cargo.lock merge conflict?`
			1. `git checkout origin/main -- Cargo.lock` to get the original Cargo.lock
			2. `cargo build` to update Cargo.lock
			3. `git add Cargo.lock`
			`4. continue the merge as normal`