Do not automatically merge Cargo.lock
#46539
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
(rust_highfive has picked a reviewer for you, use r? to override) |
|
This sounds reasonable to me but @alexcrichton is the expert here. |
kennytm
added
the
S-waiting-on-review
|
@bors: r+ whoa, what a fantastic idea! This'll make merges so much easier |
|
📌 Commit 77faf79 has been approved by |
|
Yeah, I think this is fine. @bors rollup though since it really shouldn't conflict with anyone. |
kennytm
added
S-waiting-on-bors
GuillaumeGomez
added a commit
to GuillaumeGomez/rust
that referenced
this pull request
Dec 7, 2017
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 was referenced May 14, 2018
Merged
alexcrichton
added a commit
to alexcrichton/rust
that referenced
this pull request
Aug 20, 2019
This commit backs out rust-lang#46539 in order to fully leverage rust-lang#63579 where `git` should be able to merge `Cargo.lock` nowadays with only minimal conflicts.
Centril
added a commit
to Centril/rust
that referenced
this pull request
Aug 20, 2019
…rk-Simulacrum Allow git to merge `Cargo.lock` This commit backs out rust-lang#46539 in order to fully leverage rust-lang#63579 where `git` should be able to merge `Cargo.lock` nowadays with only minimal conflicts.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
It essentially never does what it's supposed to and often leaves the
Cargo.lockin a state where it needs manual adjustments or resetting to master/yourbranch. With this setting git will always choose yourCargo.lockover the one from master and report a merge error (if both master and your branch touchedCargo.lock). Now you can run./x.py helpand it should normally update theCargo.lockto be one that has everything needed by master and your branch.