Three-way visual comparison is another feature available in the app, which enables users to easily see all the changes made by two separate individuals, compared to the original version of the document. In Araxis Merge you are able to open and work with format files such as XML, HTML, program source code, and also files that contain ASCII, MBCS and Unicode character encoding. Moreover, linking lines are drawn between the documents opened, showing clearly how they are related. The application enables a side-by-side comparison that is color coded, which will make pinpointing the similarities and differences between the files very easy. Detect similarities and differences between various files The detailed Help contents featured in the application might be very helpful to novice users that need to learn how to work with Araxis Merge. The upper side of the main window has all the actions you might need to use, in the form of buttons, while on the lower side of it, you are able to open a large number of files in order to compare them, in a tab-like display.Īlthough the program is easy to work with, this might only apply to certain professionals such as programmers, quality control managers or engineers, because of the terminology present. The interface of the application has a modern design and it is quite intuitive.
My only annoyance is that it is a little difficult to compile if it isn't present in your favorite distro repository.Araxis Merge is a software program that has been created specifically in order to help you visually compare, merge and synchronize text files and folders. See:Īn advanced feature is to use regular expressions for defining automatic merges. You can also use it compare and merge directories. The merged file is editable, so you can fine tune after merge 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. 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)
