News for hackers. Stuff that matters.
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.