问题: What's the best tool for viewing and editing a merge in Git? 在Git中查看和编辑合并的最佳工具是什么? I'd like to get a 3-way merge view, with "mine", "theirs" and "ancestor" in separate panels, and a fourth "output" panel. 我想得到一个3向合并视图,在单独的面板中有“我的”,“他们的”和“祖先”,以及第四个“输出”面板。 Also, instructions for invoking said tool would be great. 此外,调用所述工具的说明也很棒。 (I still haven't figure out how to start kdiff3 in such a way that it doesn't give me an error.) (我仍然没有弄清楚如何以这样的方式启动kdiff3,它不会给我一个错误。) My OS is Ubuntu. 我的操作系统是Ubuntu。 解决方案: 参考一: https://stackoom.com/question/ZfK/什么是Git最好的视觉合并工具-关闭 参考二: https://oldbug.net/q/ZfK/What