# git: Change merge conflict button labels \(\#34297\) · gitcafe/zed

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

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

Visibility: public

Requested revision: d65855c4a187cf17e0012e87edffda3a36cbba3e

Requested commit: d65855c4a187cf17e0012e87edffda3a36cbba3e

Commit: d65855c4a187cf17e0012e87edffda3a36cbba3e

Tree: e49022197a5da76e0cf8e1fb89f4a78917e78fb4

Author: Danilo Leal

Committer: GitHub

## Message

```
git: Change merge conflict button labels (#34297)

Following feedback that "Take Ours" and "Take Theirs" was confusing,
leading to users not knowing what exactly happened with each of these
buttons. It's now "Use HEAD" and "Use Origin", which also match what is
written in Git markers, helping parse them out more easily. Future
improvement is to have the actual branch target name in the "Use Origin"
button.

Release Notes:

- git: Improved merge conflict buttons clarity by changing labels to
"Use HEAD" and "Use Origin".
```

## Parents

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

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