fix: don't merge conflict nodes with distinct requirements#233
Merged
baszalmstra merged 1 commit intoJun 5, 2026
Merged
Conversation
a6291a0 to
3124c1a
Compare
Versions of a package that require different versions of a missing dependency are no longer collapsed into a single node in the conflict report. Previously only one of those requirements was shown and the rest were hidden, producing a misleading error message. See conda/rattler#2476.
3124c1a to
3fe5f01
Compare
2 tasks
wolfv
approved these changes
Jun 5, 2026
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
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.
When an environment cannot be solved, several versions of a package that depend on different versions of a missing dependency were grouped together and only one of their requirements was shown. This hid the other requirements and made the error misleading.
This change reports each distinct requirement separately, so every version range that cannot be satisfied is visible. This is similar to how micromamba reports the same situation.
This is what conda/rattler#2476 runs into: for r-ggpmisc on emscripten-wasm32 (where r-base has no builds) every version was collapsed into one line showing only an old r-base requirement, even though newer versions need newer r-base.
Result:
Tested with a new snapshot covering multiple versions that require different versions of a missing dependency. All existing snapshots are unchanged.