什么是Git最好的视觉合并工具？

问题描述

在Git中查看和编辑合并的最佳工具是什么？我想要在单独的面板中获得一个3路合并视图，以及mine，theirs和ancestor，以及第四个输出面板。

我的操作系统是Ubuntu。

解决方案

是一个/ b>

• 
  
  

  以下是安装它的方法：

  a href =https://doc.ubuntu-fr.org/meld =nofollow noreferrer> Ubuntu




• ：Meld for Windows的推荐版本是最新版本，可从

What's the best tool for viewing and editing a merge in Git? I'd like to get a 3-way merge view, with "mine", "theirs" and "ancestor" in separate panels, and a fourth "output" panel.

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.)

My OS is Ubuntu.

解决方案

Meld is a diff/merge tool.

Here's how to install it on:

• Ubuntu
• Mac
• Windows: "The recommended version of Meld for Windows is the most recent release, available as an MSI from http://meldmerge.org"

这篇关于什么是Git最好的视觉合并工具？的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持！