uv
Avoid invalid simplification with conflict markers
#15041

Merged

Avoid invalid simplification with conflict markers #15041

konstin merged 5 commits into main from konsti/conflict-simplifcation-extras

konstin requested a review from

BurntSushi 131 days ago

konstin added bug

konstin commented on 2025-08-03

BurntSushi approved these changes on 2025-08-04

konstin force pushed from b030aa79 to f9715ef4 130 days ago

zanieb commented on 2025-08-04

Better debug fork display

36d1eb2e

Avoid invalid simplification with conflict markers

3e699582

typo

0947bd93

Fix and test `evaluate_only_extras`

851a5fb7

konstin force pushed from f9715ef4 to 851a5fb7 129 days ago

Refactoring

7395d39f

konstin enabled auto-merge (squash) 128 days ago

konstin merged 91653f5f into main 128 days ago

konstin deleted the konsti/conflict-simplifcation-extras branch 128 days ago

Reviewers

BurntSushi

zanieb

Assignees

No one assigned

Labels

bug

Milestone

No milestone