# git: Add CHERRY_PICK_HEAD to the list of merge heads \(\#26145\) · gitcafe/zed

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

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

Visibility: public

Requested revision: 5daadc0d30c81829c87fd0c9b26badcecfb6c8ee

Requested commit: 5daadc0d30c81829c87fd0c9b26badcecfb6c8ee

Commit: 5daadc0d30c81829c87fd0c9b26badcecfb6c8ee

Tree: ba4d42ca1f883e224db0dc191f3f455ef20d0020

Author: Cole Miller

Committer: GitHub

## Message

```
git: Add CHERRY_PICK_HEAD to the list of merge heads (#26145)

Attempt to fix an issue where conflicts from a cherry-pick don't get
cleared out of the git panel after being resolved.

Release Notes:

- Git Beta: Fixed resolution of conflicts from cherry-picks not being
reflected in the git panel
```

## Parents

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

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