disambiguate "ours" vs "theirs" when resolving conflicts

[andrewbanchich]

zed can help clarify the confusing "ours" vs "theirs" terminology git uses for conflict resolutions. it would be really awesome if zed could:

1. display branch names next to ours and theirs. e.g. take ours (my-current-branch) | take theirs (main).
2. when we hover over "take ours" or "take theirs", highlight the one we're hovering over.
3. allow us to e.g. hold "ctrl" and click one of the colored regions of code to take it.

[SomeoneToIgnore]

#31045

[SomeoneToIgnore]

The overall idea seems to be exact to me: confusion when selecting between the two options in the conflict region.
Can you elaborate, what's very different here and there?

[andrewbanchich]

1. The linked issue is labeled as a bug, which means Zed is doing something wrong. My issue is not a bug. It's Zed helping to fix a poor naming choice from Git.
2. My issue is a feature request for three specific things, none of which are mentioned in the linked issue.

[SomeoneToIgnore]

1. The linked issue is not triaged and by the preliminary look of it, suffers from the exact same cause of git picking names more interesting than needed.
2. That would be great to add into that issue indeed.

[andrewbanchich]

So you're planning on adding a feature issue for my suggestions then? If so, could you use my issue instead so I can track these please?

If the other is incorrect then seems like that should be closed.

[SomeoneToIgnore]

We plan to adjust the way things are displayed in the commit resolution window, as whatever the current thing is, it's ambiguous.

The design that it will be implemented in, most probably will be driven by the designer's/implementor's ideas about this, bit I do see the value in all that's proposed here.

That all will be done as part of the issue linked.