Conrad Irwin ff020dd053
git_ui: Batch merge conflict anchor resolution ( #63394 ) ...
Improves merge-conflict loading by resolving ordered conflict anchors
with a single excerpt sweep instead of restarting the excerpt scan four
times per conflict.
The pull request also adds `script/generate-merge-conflict-benchmark`,
which creates validated small, medium, or severe repositories with real
unresolved Git merges.
On the severe workload (128 files × 256 conflicts), anchor conversion
decreased from 483.5 ms to 5.9 ms, saving about 478 ms, or roughly 5% of
the total refresh.
Closes
https://linear.app/zed-industries/issue/FR-174/improve-git-panel-performance-for-large-merge-conflicts
## Testing
- `cargo test -p multi_buffer
test_ordered_buffer_anchor_ranges_to_anchor_ranges`
- `cargo test -p git_ui conflict`
- `./script/clippy -p multi_buffer -p git_ui`
- Generated and validated the small synthetic merge-conflict workload
Release Notes:
- Improved performance when opening large merge conflicts
2026-08-31 15:07:24 +00:00
2026-08-31 11:00:40 +00:00
2025-06-17 20:39:35 +00:00
2025-10-09 05:11:11 +00:00
2026-07-21 13:20:31 +00:00
2026-08-17 09:35:54 +00:00
2026-07-07 12:49:19 +00:00
2025-11-24 16:15:38 +00:00
2025-06-18 19:07:57 +00:00
2025-01-17 09:39:13 +02:00
2024-09-30 17:46:21 -04:00
2026-06-10 23:51:59 +00:00
2025-10-14 04:43:28 +00:00
2026-05-15 09:08:55 +00:00
2026-04-23 00:56:18 +02:00
2025-08-04 15:35:19 -04:00
2026-08-31 05:42:11 +00:00
2026-08-31 05:42:11 +00:00
2026-08-31 05:42:11 +00:00
2026-02-24 05:13:04 +00:00
2026-02-23 09:46:28 -07:00
2026-07-03 08:27:48 +00:00
2026-05-28 20:19:17 +00:00
2025-06-10 11:20:07 -04:00
2025-06-08 09:34:07 +00:00
2026-06-22 13:00:51 +00:00
2026-04-09 00:21:02 +02:00
2026-04-09 00:21:02 +02:00
2026-08-20 10:08:48 +00:00
2025-06-16 17:29:36 -04:00
2025-03-10 01:06:11 -07:00
2026-08-07 11:11:10 +00:00
2025-03-10 01:06:11 -07:00
2025-11-12 21:50:15 -07:00
2025-11-24 11:30:19 +02:00
2025-03-10 01:06:11 -07:00
2024-11-13 12:41:50 -05:00
2025-07-09 08:57:03 +08:00
2025-06-04 09:23:23 -06:00
2026-02-25 19:02:37 -06:00
2026-02-18 08:46:47 -06:00
2026-04-02 15:26:37 +00:00
2026-04-13 22:28:20 +03:00
2026-01-07 14:24:02 +00:00
2025-03-10 01:06:11 -07:00
2025-02-05 14:30:09 +00:00
2026-02-02 23:55:03 +01:00
2025-12-18 21:59:05 -05:00
2025-12-02 17:54:08 +00:00
2025-12-02 17:54:08 +00:00
2026-01-30 19:55:29 -07:00
2026-08-31 15:07:24 +00:00
2025-11-19 13:00:35 -05:00
2025-03-10 01:06:11 -07:00
2025-07-09 08:57:03 +08:00
2024-09-27 10:59:19 -04:00
2024-09-27 10:59:19 -04:00
2025-11-10 23:55:19 +00:00
2026-04-29 13:59:31 +00:00
2026-07-31 15:45:04 +00:00
2025-11-12 11:40:31 +01:00
2026-07-02 09:46:22 +00:00
2026-02-18 17:15:15 +00:00
2026-07-16 16:17:01 +00:00
2026-08-21 07:53:28 +00:00
2025-06-04 09:23:14 -06:00
2026-07-31 15:45:04 +00:00
2026-07-31 12:44:52 +00:00
2024-01-23 16:52:08 +01:00
2025-03-10 01:06:11 -07:00
2024-11-18 16:39:57 -05:00
2025-11-21 09:12:19 -07:00
2025-06-16 17:29:36 -04:00
2026-08-20 10:20:14 +00:00
2025-03-10 01:06:11 -07:00
2026-07-14 13:56:45 +00:00
2025-03-10 01:06:11 -07:00
2025-02-28 22:37:03 +00:00
2026-05-28 20:19:17 +00:00
2025-12-15 22:19:18 -07:00
2025-03-10 01:06:11 -07:00
2024-01-23 10:34:43 -07:00
2024-02-25 11:03:33 -05:00
2024-10-12 23:23:56 -07:00
2025-04-18 19:28:14 +00:00
2026-02-18 10:36:38 -06:00
2025-06-18 19:07:57 +00:00
2025-11-13 15:21:53 +00:00
2025-03-10 01:06:11 -07:00
2026-02-16 20:32:51 -06:00
2026-02-12 12:42:41 -08:00
2025-03-01 22:43:10 +08:00
2026-07-15 20:35:16 +00:00
2026-07-15 20:35:16 +00:00
2024-11-18 16:41:22 -05:00
2025-02-19 10:28:23 -07:00
2025-02-19 10:28:23 -07:00
2025-08-22 19:32:49 +00:00
2026-02-18 06:39:09 -06:00
2026-06-17 21:07:29 +00:00
2025-12-19 18:09:40 +00:00
2026-05-18 15:35:35 +00:00
2025-03-10 01:06:11 -07:00
2024-11-28 10:31:12 +02:00
2026-06-25 17:30:12 +00:00
2024-03-19 14:19:32 -04:00
2026-04-13 22:28:20 +03:00
2026-01-24 13:15:01 -05:00
2025-12-17 16:42:31 -06:00
2025-03-10 01:06:11 -07:00
2025-09-25 09:03:27 -04:00
Conrad Irwin
ff020dd053