# git_ui: Don't display the merge conflict notification if an agent is running \(\#51498\) · gitcafe/zed

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

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

Visibility: public

Requested revision: 70a742eadcf8968f80378ec4e424d7cc45860cef

Requested commit: 70a742eadcf8968f80378ec4e424d7cc45860cef

Commit: 70a742eadcf8968f80378ec4e424d7cc45860cef

Tree: 3b7175e02b6c96eb87fc89ce1e812104120552f7

Author: Danilo Leal

Committer: GitHub

## Message

```
git_ui: Don't display the merge conflict notification if an agent is running (#51498)

This PR is motivated by internal feedback in which the notification that
we show inviting to resolve merging conflicts with an agent also pops up
if the agent itself ran `git merge`. In this case, the notification is
unnecessary noise. So, what I'm doing here is simply _not_ showing it if
there's a running agent.

I want to note that this change is accepting a trade-off here, in which
there could be cases that even if an agent is running, the notification
can still be useful. There could be other ways to identify whether the
agent is running `git merge`, but they all felt a bit too complex for
the moment. And given this is reasonably an edge case, I'm favoring a
simple approach for now.

Release Notes:

- N/A

---------

Co-authored-by: Lukas Wirth <lukas@zed.dev>
```

## Parents

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

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