# git: Use branch names for resolve conflict buttons \(\#44421\) · gitcafe/zed

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

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

Visibility: public

Requested revision: 464d4f72eb16bfd2477860c4a9b796fd0df895e6

Requested commit: 464d4f72eb16bfd2477860c4a9b796fd0df895e6

Commit: 464d4f72eb16bfd2477860c4a9b796fd0df895e6

Tree: 030a5ea4cdfee177981e1d3c069640b3dcd6c19c

Author: Anthony Eid

Committer: GitHub

## Message

```
git: Use branch names for resolve conflict buttons (#44421)

This makes merge conflict resolution clearer because we're now parsing
the branch names from the conflict region instead of hardcoding HEAD and
ORIGIN.

### Before
<img width="1157" height="1308" alt="image"
src="https://github.com/user-attachments/assets/1fd72823-4650-48dd-b26a-77c66d21614d"
/>

### After
<img width="1440" height="1249" alt="Screenshot 2025-12-08 at 2 17
12 PM"
src="https://github.com/user-attachments/assets/d23c219a-6128-4e2d-a8bc-3f128aa55272"
/>

Release Notes:

- git: Use branch names for git conflict buttons instead of HEAD and
ORIGIN
```

## Parents

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

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