Avatar for the astral-sh user
astral-sh
uv
BlogDocsChangelog

Avoid conflict set combinatorial explosion

#19538Merged
Comparing
tk/fix-conflict-marker-explosion
(
c11dc4e
) with
main
(
149ef4d
)
CodSpeed Performance Gauge
-1%
Untouched
5
Ignored
1

Benchmarks

6 total
resolve_warm_airflow
crates/uv-bench/benches/uv.rs::uv::resolve_warm_airflow
CodSpeed Performance Gauge
0%
525.5 ms524.5 ms
resolve_warm_jupyter_universal
crates/uv-bench/benches/uv.rs::uv::resolve_warm_jupyter_universal
CodSpeed Performance Gauge
0%
144.8 ms145.3 ms
resolve_warm_jupyter
crates/uv-bench/benches/uv.rs::uv::resolve_warm_jupyter
CodSpeed Performance Gauge
-2%
45 ms45.8 ms
resolve_warm_jupyter
crates/uv-bench/benches/uv.rs::uv::resolve_warm_jupyter
CodSpeed Performance Gauge
-2%
80.4 ms81.9 ms
resolve_warm_jupyter_universal
crates/uv-bench/benches/uv.rs::uv::resolve_warm_jupyter_universal
CodSpeed Performance Gauge
-3%
213.7 ms220.3 ms
resolve_warm_airflow
crates/uv-bench/benches/uv.rs::uv::resolve_warm_airflow
Ignored
CodSpeed Performance Gauge
+1%
882.1 ms872.7 ms

Commits

Click on a commit to change the comparison range
Base
main
149ef4d
-1.36%
Avoid conflict set combinatorial explosion
c11dc4e
19 hours ago
by EliteTK
© 2026 CodSpeed Technology
Home Terms Privacy Docs