sublime_merge icon indicating copy to clipboard operation
sublime_merge copied to clipboard

Published 20 hours ago • verified publisher icon sublimehq

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

Open reslear opened this issue 2 years ago • 3 comments
trafficstars

Problem description

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

Screenshot 2023-03-13 at 13 33 26

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
Screenshot 2023-03-13 at 14 00 48

reslear avatar Mar 13 '23 13:03 reslear

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

srbs avatar Apr 11 '23 13:04 srbs

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 😃

cyber-distillery avatar May 23 '23 12:05 cyber-distillery

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

michaelblyons avatar Feb 18 '24 00:02 michaelblyons