# Mitigate panic in merge conflict resolution \(\#29678\) · gitcafe/zed

[View on GitCafe](https://git.cafe/gitcafe/zed/commit/ff4900c9429206b3650f66042255e47ec9d36ae6)

Repository: [gitcafe/zed](https://git.cafe/gitcafe/zed)

Visibility: public

Requested revision: ff4900c9429206b3650f66042255e47ec9d36ae6

Requested commit: ff4900c9429206b3650f66042255e47ec9d36ae6

Commit: ff4900c9429206b3650f66042255e47ec9d36ae6

Tree: 8b8565bb0863d79bb0721187ffd68db916543be2

Author: Cole Miller

Committer: GitHub

## Message

```
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
```

## Parents

- [632f08d2a3b708c6baa8aa6b1bf53c482c3c3a6a](https://git.cafe/gitcafe/zed/commit/632f08d2a3b708c6baa8aa6b1bf53c482c3c3a6a?format=markdown)

[Source at this commit](https://git.cafe/gitcafe/zed/tree/ff4900c9429206b3650f66042255e47ec9d36ae6?format=markdown)