Skip to content

Add a description of Cargo.lock conflicts in the Cargo FAQ #12092

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
heisen-li wants to merge 6 commits into from
Closed

Add a description of Cargo.lock conflicts in the Cargo FAQ #12092

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
347f623
Add message for Cargo.lock conflicts
heisen-li May 6, 2023
1d40048
fix test
heisen-li May 6, 2023
4bc0ca9
Merge branch 'master' of https://github.com/QiangHeisenberg/cargo int…
heisen-li May 18, 2023
8c44372
Added FAQ cargo.lock conflict information
heisen-li May 18, 2023
9314fe5
modify description
heisen-li May 19, 2023
d8a6657
Modify formatting and grammar issues according to comments
heisen-li May 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/cargo/core/resolver/errors.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,8 @@ pub(super) fn activation_error(

msg.push_str("\n\nfailed to select a version for `");
msg.push_str(&*dep.package_name());
msg.push_str("` which could resolve this conflict");
msg.push_str("` which could resolve this conflict.");
msg.push_str("`\nTry running `cargo generate-lockfile` to generate the correct Cargo.lock");

return to_resolve_err(anyhow::format_err!("{}", msg));
}
Expand Down