PR #9370 add conflict markers to the lock file

add conflict markers to the lock file #9370

BurntSushi merged 5 commits into main from ag/i9289

BurntSushi requested a review from

charliermarsh 1 year ago

BurntSushi force pushed from 85b76907 to cc2dbe9c 1 year ago

charliermarsh commented on 2024-11-22

BurntSushi force pushed from cc2dbe9c to 89c3d71a 1 year ago

BurntSushi force pushed from 7d4958d3 to 8db482cf 1 year ago

BurntSushi added internal

BurntSushi changed the base branch from main to ag/moar-refactoring 1 year ago

BurntSushi force pushed from 8db482cf to a468f5a3 1 year ago

Base automatically changed from ag/moar-refactoring to main 1 year ago

BurntSushi force pushed from a468f5a3 to 219f1f3b 1 year ago

BurntSushi force pushed from 12ca9db9 to 037c9cd0 1 year ago

BurntSushi force pushed from 037c9cd0 to e3ef041d 1 year ago

BurntSushi force pushed from e3ef041d to f0fa2316 1 year ago

BurntSushi force pushed from f0fa2316 to 1fa5245e 1 year ago

BurntSushi force pushed from 1fa5245e to 94059e87 1 year ago

BurntSushi force pushed from 94059e87 to dbe806f5 1 year ago

BurntSushi force pushed from dbe806f5 to 26436639 1 year ago

BurntSushi force pushed from 26436639 to e3da37af 1 year ago

BurntSushi force pushed from e3da37af to 79ade567 1 year ago

BurntSushi force pushed from 79ade567 to e85e971a 1 year ago

BurntSushi force pushed from e85e971a to f951f2db 1 year ago

BurntSushi force pushed from f951f2db to 64409efc 1 year ago

BurntSushi force pushed from 64409efc to a2db1ee4 1 year ago

BurntSushi marked this pull request as ready for review 1 year ago

BurntSushi requested a review from

charliermarsh 1 year ago

BurntSushi requested a review from

konstin 1 year ago

BurntSushi changed the title ~~WIP for adding conflict markers to the lock file~~ add conflict markers to the lock file 1 year ago

BurntSushi added bug

BurntSushi added lock

BurntSushi removed internal

charliermarsh commented on 2024-12-06

charliermarsh approved these changes on 2024-12-06

BurntSushi force pushed from a2db1ee4 to cded50f0 1 year ago

konstin commented on 2024-12-09

BurntSushi force pushed from cded50f0 to cc1d8e62 1 year ago

BurntSushi force pushed from cc1d8e62 to ba47e189 1 year ago

BurntSushi force pushed from ba47e189 to b5ef4c62 1 year ago

uv/tests: add several conflict marker tests

9f3689ca

uv-resolver: introduce conflict markers

f7ca643a

uv/tests: update conflict tests

c19a0138

uv/tests: add group-specific and mixed tests

2f4a35c9

BurntSushi force pushed from b5ef4c62 to 8a5ce951 1 year ago

BurntSushi requested a review from

konstin 1 year ago

uv-resolver: fix graph traversal

2f69ea74

BurntSushi force pushed from 8a5ce951 to 2f69ea74 1 year ago

konstin approved these changes on 2024-12-10

BurntSushi merged edf875e3 into main 1 year ago

BurntSushi deleted the ag/i9289 branch 1 year ago

Reviewers

konstin

charliermarsh

Assignees

No one assigned

Labels

bug lock

Milestone

No milestone

uv add conflict markers to the lock file #9370 Merged

add conflict markers to the lock file #9370

uv
add conflict markers to the lock file
#9370

Merged