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
..
askpass_modal.rs	chore: Bump Rust edition to 2024 (#27800)	2025-03-31 20:55:27 +02:00
blame_ui.rs	editor: Move blame popover from hover_tooltip to editor prepaint (#29320)	2025-04-25 01:52:24 +05:30
branch_picker.rs	Git activity indicator (#28204)	2025-04-07 18:10:01 +00:00
commit_message_prompt.txt	git_ui: Try to prompt the model out of including the diff output (#26281)	2025-03-07 15:05:35 +00:00
commit_modal.rs	git_panel: Fix amend check (#29059)	2025-04-18 22:24:49 +05:30
commit_tooltip.rs	editor: Move blame popover from hover_tooltip to editor prepaint (#29320)	2025-04-25 01:52:24 +05:30
commit_view.rs	Add searchable global tab switcher (#28047)	2025-04-28 09:21:27 +00:00
conflict_view.rs	Mitigate panic in merge conflict resolution (#29678)	2025-04-30 11:25:26 -04:00
git_panel.rs	Git tweaks (#28791)	2025-04-28 23:42:23 -06:00
git_panel_settings.rs	Git tweaks (#28791)	2025-04-28 23:42:23 -06:00
git_ui.rs	Highlight merge conflicts and provide for resolving them (#28065)	2025-04-23 12:38:46 -04:00
onboarding.rs	chore: Bump Rust edition to 2024 (#27800)	2025-03-31 20:55:27 +02:00
picker_prompt.rs	chore: Bump Rust version to 1.86 (#28021)	2025-04-03 23:32:50 +02:00
project_diff.rs	Git tweaks (#28791)	2025-04-28 23:42:23 -06:00
remote_output.rs	Fix message on push (#26588)	2025-03-12 20:18:28 +00:00
repository_selector.rs	chore: Bump Rust edition to 2024 (#27800)	2025-03-31 20:55:27 +02:00