mirror of
https://github.com/ChrisTitusTech/linutil.git
synced 2024-11-21 21:09:42 +00:00
i don't think we need this anymore (#737)
This commit is contained in:
parent
2f3c49ed0f
commit
d5c05c94bb
|
@ -1,5 +0,0 @@
|
|||
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
|
Loading…
Reference in New Issue
Block a user