What's the best visual merge tool for Git?

git version-control merge
andy picture andy · Sep 26, 2008 · Viewed 429.3k times · Source

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.

Answer

user20805 picture user20805 · Sep 26, 2008

Meld is a free, open-source, and cross-platform (UNIX/Linux, OSX, Windows) diff/merge tool.

Here's how to install it on:

Related questions

git: updates were rejected because the remote contains work that you do not have locally

I'm working on a team with a few developers using git on BitBucket. We are all working on a dev branch, not pushing to master until a release. One of the developers committed incorrect code that overwrote my own by …

Read More
Git diff between current branch and master but not including unmerged master commits

I want a diff of all changes in a branch that is not merged to master yet. I tried: git diff master git diff branch..master git diff branch...master However, in each of these cases the diff contains content …

Read More
How do I create a readable diff of two spreadsheets using git diff?

We have a lot of spreadsheets (xls) in our source code repository. These are usually edited with gnumeric or openoffice.org, and are mostly used to populate databases for unit testing with dbUnit. There are no easy ways of doing …

Read More