It also solves almost all the ClearCase conflicts. You can configure it as the default diff tool in Subversion, Git, Mercurial, and ClearCase. One of the first tools I install in any machine. It is in my list of favorite open source software.
Side note: you can also experiment with Git merge strategies It is possible to integrate it with Tortoise and with your linux shell. There's versions for Windows and Linux with the same interface. I recommend to configure it as Git mergetool or to use a nice Git frontend as GitExtensions.Įven when Git/Subversion indicates a conflict, Kdiff3 solves it automatically.
Kdiff3 conflict resolution algorithm is really impressive and it nicely integrates with Git.
0 kommentar(er)
