are there any tools for resolving git merge conflicts which are different from (and maybe better than?) the classic 3-column merge tool?
(other than "manually edit the file yourself” obviously)
i’m also interested in what useful merge tool features are out there in general, so far i’ve heard about the 4 pane merge (instead of 3) and automatic conflict resolution if both sides are the same
(2/?)
@b0rk I hadn't put this together until seeing that screenshot: the GUI tools always show you the merge base, whereas git defaults to not showing the merge base when you manually edit files (but that can be changed in the config). That makes me wonder if there are people who prefer the GUI because they can see the merge base, but would prefer text if they knew about that setting.
@parvXtl @b0rk The merge base is the most recent commit that's in the history of the commits you're merging together. You can think of it as the point where the history first diverged.
https://wizardzines.com/comics/meet-the-merge/ is a good illustration of why it's useful to be able to see it (it's labeled "original" there).
@madewokherd What is a "merge base", a commit just before where the conflict had happened?
@b0rk