Cole Miller ff4900c942 Mitigate panic in merge conflict resolution (#29678) ... We have a report of a panic when indexing into `BufferConflicts.block_ids` using the `old_range` from the `ConflictsUpdated` event, indicating that the `block_ids` array can get out of sync with the underlying `ConflictSet`. This PR adds a mitigation so that we won't panic in this situation, as a stopgap until the bug can be reproduced in a test and fixed at the root. Release Notes: - N/A		2025-04-30 11:25:26 -04:00
..
src	Mitigate panic in merge conflict resolution (#29678)	2025-04-30 11:25:26 -04:00
Cargo.toml	Add workspace-hack (#27277)	2025-04-02 13:26:34 -07:00
LICENSE-GPL	Add placeholder git panel (#21894)	2024-12-11 22:13:52 -05:00