# Highlight merge conflicts and provide for resolving them \(\#28065\) · gitcafe/zed

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

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

Visibility: public

Requested revision: 724c9351968b5fab6f17fb2feec39039736423e0

Requested commit: 724c9351968b5fab6f17fb2feec39039736423e0

Commit: 724c9351968b5fab6f17fb2feec39039736423e0

Tree: 398e2485d39652420d052e47369500b2055c46e9

Author: Cole Miller

Committer: GitHub

## Message

```
Highlight merge conflicts and provide for resolving them (#28065)

TODO:

- [x] Make it work in the project diff:
  - [x] Support non-singleton buffers
  - [x] Adjust excerpt boundaries to show full conflicts
- [x] Write tests for conflict-related events and state management
- [x] Prevent hunk buttons from appearing inside conflicts
- [x] Make sure it works over SSH, collab
- [x] Allow separate theming of markers

Bonus:

- [ ] Count of conflicts in toolbar
- [ ] Keyboard-driven navigation and resolution
- [ ] ~~Inlay hints to contextualize "ours"/"theirs"~~

Release Notes:

- Implemented initial support for resolving merge conflicts.

---------

Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com>
```

## Parents

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

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