Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
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 free, open-source, and cross-platform (UNIX/Linux, OSX, Windows) diff/merge tool.
Here’s how to install it on: