squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Rollup merge of #46539 - oli-obk:cargo_lock, r=alexcrichton

Browse source 
Do not automatically merge `Cargo.lock`

It essentially never does what it's supposed to and often leaves the `Cargo.lock` in a state where it needs manual adjustments or resetting to master/yourbranch. With this setting git will always choose your `Cargo.lock` over the one from master and report a merge error (if both master and your branch touched `Cargo.lock`). Now you can run `./x.py help` and it should normally update the `Cargo.lock` to be one that has everything needed by master and your branch.
This commit is contained in:
Guillaume Gomez 2017-12-07 23:59:03 +01:00 committed by GitHub
commit 655303ce9b
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitattributes vendored
View file

@ -7,3 +7,4 @@
src/etc/installer/gfx/* binary
*.woff binary
src/vendor/** -text
Cargo.lock -merge