Subversion Git Mercurial and others support three-way merges combining mine theirs and the base revision and support graphical tools to resolve conflicts What tool do you use Windows Mac nbsp OS nbsp X Linux free or commercial you name it Here s a few that I ve used or heard of just to get the conversation started KDiff3 DiffMerge P4Merge Meld Beyond Compare Pro I recognize that this is sort of like the Best Diff Tool but it s different in that I explicitly focus on three-way merge tools WinMerge is off the list for example

vimdiff It s great All you need is a window three feet wide

The summary is that I found ECMerge to be a great though commercial product http www elliecomputing com products merge overview asp I also agree with MrTelly that Ultracompare is very good One nice feature is that it will compare RTF and Word docs which is handy when you end up programming in word with the sales guys and they don t manage their docs correctly

Meld Diff Viewer I have had only good experiences working with Meld I use it when I have to do messy code merges between branches It is simple to use and has a clean interface Open Source Linux Windows and MacOS Supported Multiple File Diff Three-way Compare Support In Ubuntu install is as simple as sudo apt-get install meld

Ultracompare It is really good handles large files more than 1 nbsp GB well is available for Windows Mac Linux and it s commercial but it is worth it

Just checked out P4merge since I heard about it in another blog article Very slick interface and FREE I ve been a faithful Araxis Merge user but considering this is free and awesome I d encourage you to check it out

Araxis Merge It is commerical but it is so worth it It is available for Windows and the Mac nbsp OS nbsp X

KDiff3 open source cross platform Same interface for Linux and Windows very smart algorithm for solving conflicts regular expressions for automatically solving conflicts integrate with ClearCase SVN Git MS Visual Studio editable merged file compare directories Its keyboard-navigation is great ctrl-arrows to navigate the diffs ctrl-1 2 3 to do the merging Also see https stackoverflow com a 2434482 42473

Kdiff3 conflict resolution algorithm is really impressive Even when subversion indicates a conflict Kdiff3 solves it automatically There s versions for Windows and Linux with the same interface It is possible to integrate it with Tortoise and with your linux shell It is in the list of my favorite open source software One of the first tools I install in any machine You can configure it as the default diff tool in Subversion Git Mercurial and ClearCase It also solves almost all the ClearCase conflicts In Windows it has a nice integration with windows explorer select two files and right click to compare them or right click to save to later a file and then select another one to compare The merged file is editable Has slick keyboard shortcuts You can also use it compare and merge directories See An advanced feature is to use regular expressions for defining automatic merges My only annoyance is that it is a little difficult to compile if it isn t present in your favorite distro repository

[version-control] What's the best three-way merge tool?

Beyond Compare 3 Pro supports three-way merging, and it is a pretty impressive merge tool. It's commercial (but worth it, IMHO) and is available on Windows, Linux, and Mac OS X.

As pointed out in a comment, it's also inexpensive.

Enter image description here

Note: If one does not have a merge set, that is, merge markers resident in the destination file, Beyond Compare does not offer three-way file compare/editing. Beyond Compare says that feature is on their list.

Note: 3-way merge is a feature in the Pro edition of Beyond Compare 3 only

Examples related to version-control

• How can I switch to another branch in git? • Do I commit the package-lock.json file created by npm 5? • Project vs Repository in GitHub • Remove a modified file from pull request • Git push: "fatal 'origin' does not appear to be a git repository - fatal Could not read from remote repository." • Git: How to squash all commits on branch • git: updates were rejected because the remote contains work that you do not have locally • Sourcetree - undo unpushed commits • Cannot checkout, file is unmerged • Git diff between current branch and master but not including unmerged master commits

Examples related to merge

• Pandas Merging 101 • Python: pandas merge multiple dataframes • Git merge with force overwrite • Merge two dataframes by index • Visual Studio Code how to resolve merge conflicts with git? • merge one local branch into another local branch • Merging dataframes on index with pandas • Git merge is not possible because I have unmerged files • Git merge develop into feature branch outputs "Already up-to-date" while it's not • How merge two objects array in angularjs?

Examples related to dvcs

• Pushing to Git returning Error Code 403 fatal: HTTP request failed • Git push won't do anything (everything up-to-date) • Mercurial — revert back to old version and continue from there • How do I show the changes which have been staged? • How can I stop .gitignore from appearing in the list of untracked files? • Undo working copy modifications of one file in Git? • What's the best three-way merge tool? • What is the Difference Between Mercurial and Git?