What’s the best three-way merge tool? [closed]

by

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

enter image description here

More Related Contents:

  1. Why is a 3-way merge advantageous over a 2-way merge?
  2. Named Branches vs Multiple Repositories
  3. Mercurial — revert back to old version and continue from there
  4. What’s the easiest way to commit and push a single file while leaving other modifications alone?
  5. Source Control – Distributed Systems vs. Non Distributed – What’s the difference?
  6. Comparison between Centralized and Distributed Version Control Systems [closed]
  7. Mercurial: Merging one file between branches in one repo
  8. How can I use ClearCase to “add to source control …” recursively?
  9. Git cherry pick and datamodel integrity
  10. Updates were rejected because the remote contains work that you do not have locally
  11. Undo working copy modifications of one file in Git?
  12. What’s the best visual merge tool for Git? [closed]
  13. How can I stop .gitignore from appearing in the list of untracked files?
  14. What is the cleverest use of source repository that you have ever seen?
  15. Storing third-party libraries in source control
  16. Mercurial for Beginners: The Definitive Practical Guide
  17. Is version control (ie. Subversion) applicable in document tracking? [closed]
  18. Locking binary files using git version control system
  19. Mercurial Subrepos – How do you create them and how do they work?
  20. How do I perform a recursive checkout using ClearCase?
  21. Is there a way to keep Hudson / Jenkins configuration files in source control?
  22. Can you “ignore” a file in Perforce?
  23. Git: merging public and private branches while while keeping certain files intact in both branches
  24. What is the difference between hg forget and hg remove?
  25. Error “Updates were rejected because the remote contains work that you do not have locally”
  26. Do you continue development in a branch or in the trunk? [closed]
  27. What makes some version control systems better at merging?
  28. TFS 2017 – how build/deliver only changed files?
  29. Git merge squash repeatedly
  30. How to perform a three-way diff in Git without merging?

Leave a Comment