# git_ui: Fix "resolve with agent" merge conflict notification \(\#51290\) · gitcafe/zed

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

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

Visibility: public

Requested revision: 3c82ddf261cd31d6150cd4aebf4ccbfc6518ea2e

Requested commit: 3c82ddf261cd31d6150cd4aebf4ccbfc6518ea2e

Commit: 3c82ddf261cd31d6150cd4aebf4ccbfc6518ea2e

Tree: ba3e707ae5b6e9107d602ee0c4d6cd3fb0e61027

Author: Danilo Leal

Committer: GitHub

## Message

```
git_ui: Fix "resolve with agent" merge conflict notification (#51290)

Follow up to https://github.com/zed-industries/zed/pull/49807

This PR fixes the merge conflict notification by making it appear only
once per a given set of conflicted paths, as opposed to showing every
time the `ConflictsUpdated` or `StatusesChanged` even would fire.

Release Notes:

- N/A
```

## Parents

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

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