Skip to content

Ignore inferred conflict marker when determining if lockfile is up-to-date #15884

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

Draft
zanieb wants to merge 3 commits into
base: main
Choose a base branch
from

Update snapshot

44522f0
Select commit
Loading
Failed to load commit list.
Draft

Ignore inferred conflict marker when determining if lockfile is up-to-date #15884

Update snapshot
44522f0
Select commit
Loading
Failed to load commit list.
CodSpeed HQ / CodSpeed Performance Analysis succeeded Sep 16, 2025 in 0s

Performance Gate Passed

✅ 3 untouched benchmarks

Comparing zb/lock-conflict-transitive (44522f0) with main (9fc966b)

Open in CodSpeed
View more details on CodSpeed HQ