News for hackers. Stuff that matters.
Re:Show HN: Sublime Merge – A Git client from the makers of ... by krupan on Thursday September 20, 2018 @06:36AM (#18031173)
"Conflicts are presented with a 3-pane view. On the left are your changes and on the right are theirs. In the center pane is the resolved text"

They are missing a pane then. A 3-way merge involves your changes, others changes, a common ancestor, and the resolved text. kdiff3, Beyond Compare, and very recent versions of emacs are the only tools that I've seen that present this properly.

Re:Show HN: Sublime Merge – A Git client from the makers of ... by onion2k on Thursday September 20, 2018 @06:49AM (#18031238)
A 3-way merge involves your changes, others changes, a common ancestor, and the resolved text.

That's true, but is it important to have all those things visible when you're resolving a conflict? The design of a UI should be driven by what the user needs to see, not the data that's being used. Most apps have absolutely loads of invisible data in the background making things work; that doesn't mean they need to be front and centre in the UI.

In my experience of resolving conflicts I can't remember a time when I've needed to refer to the common ancestor, so do I really want to give it screen space?

Re:Show HN: Sublime Merge – A Git client from the makers of ... by quietbritishjim on Thursday September 20, 2018 @08:47AM (#18031911)
It's fair to take either opinion – personally I often find the common ancestor quite important, but I could understand why you might not. But it's disingenuous to call a tool "three way merge" if it's not shown. If you're only showing the two immediate parents, that's a regular old two-way merge.
Re:Show HN: Sublime Merge – A Git client from the makers of ... by pfranz on Thursday September 20, 2018 @06:54PM (#18036042)
I actually just encountered this today. My changes, a large refactor, was trying to be reconciled with tweaks done before my refactor. Diffing mine against their's was gross. The first thing I wanted to see what their changes diffed against our ancestor looked like.

However, in the end I didn't end up merging any code and I haven't yet been in a position where this has come up much. I just thought it was a funny coincidence I encountered this earlier today.

Re:Show HN: Sublime Merge – A Git client from the makers of ... by jskinner on Thursday September 20, 2018 @06:47AM (#18031226)
The middle pane is toggleable between the merge results and the base file
Re:Show HN: Sublime Merge – A Git client from the makers of ... by tom_ on Thursday September 20, 2018 @09:44AM (#18032356)
You can use the central panel for both: common ancestor text in the neutral colour, and differences between the common ancestor and the resolved text in colour, with one colour for differences that come from the 'left' set of changes, and one colour that come from the 'right' set.

This is what Araxis Merge did, or at least used to do when I used it, and I found it more useful than P4Merge's 4-way display (which just takes up more space than necessary).

It's possible there are types of merge where it's useful to have the common ancestor permanently visible, but I never seemed to run into them.

Re:Show HN: Sublime Merge – A Git client from the makers of ... by darekkay on Thursday September 20, 2018 @10:52AM (#18032840)
p4merge also display 4 panels as you described. It's been my go-to merge tool for years now.
Re:Show HN: Sublime Merge – A Git client from the makers of ... by SkyPuncher on Thursday September 20, 2018 @11:01AM (#18032912)
Jetbrains IDE's use the 3-pane approach and I find it very, very easy to use. Just the right amount of info for 95+% of use cases.

If I need a common accessor, I'll pull it up some other way (either via history tools or actually finding it in Github).

Re:Show HN: Sublime Merge – A Git client from the makers of ... by nicolas_t on Thursday September 20, 2018 @06:44AM (#18031209)
Completely agree, showing the common ancestor is extremely helpful.