Resolve button not informative and not intuitive "ours/theirs" add branch name

sublimehq / sublime_merge

Issue tracker for Sublime Merge

https://www.sublimemerge.com

273 stars 14 forks source link

Resolve button not informative and not intuitive "ours/theirs" add branch name #1735

Open reslear opened 1 year ago

reslear commented 1 year ago

Problem description

Every time I do not understand which of them is "ours" and "theirs"

Preferred solution

It would be more informative to add a branch name, for example.

Screenshot 2023-03-13 at 13 37 29

Alternatives

alternative

Screenshots

on top

Other editors

Tower Intuitive write from: branch

srbs commented 1 year ago

related: #1673, #1261 see also: #792

Drunk-Creator commented 1 year ago

Yes, I totally agree with this, some products in the market already have such a feature or better informing about what "ours/theirs" mean. However, the reason why I have not switched is because I love the UI of Sublime Merge. Hope it will be added soon 😃

michaelblyons commented 6 months ago

The next version of Git adds placeholders for ours/theirs/common label names in the instructions to a mergetool.