Guard uv upgrade conflict attribution - #20593
Draft
zsol wants to merge 1 commit into
Draft
Conversation
zsol
force-pushed
the
zsol/upgrade-06-conflicts
branch
from
July 28, 2026 12:10
fc0df64 to
1ab1970
Compare
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
1 participant
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.
Universal lockfiles can contain forks created by conflicting projects, extras, or dependency groups. Projecting those forks onto ordinary PEP 508 markers can make a version from one conflicting branch appear applicable to an unrelated declaration, causing
uv upgradeto rewrite the wrong requirement.This blocks attribution for declarations under a conflicting project, extra, or group, including explicit and compound extra markers and included dependency groups. The affected declaration remains unchanged with a precise warning while other safe declarations can still be upgraded. Conflicts belonging to another declaration or workspace member do not block unrelated optional or group dependencies.