Hello! I have installed Araxis Merge 6 on my computer to use in file comparison (diff), merging and folder synchronization. At times I realize that there are merge conflicts in the process. How can I resolve the issue of merge conflicts? Further, how does Araxis Merge 6 compare with DiffMerge? Thanks.
You should consider first if Araxis Merge 6 that you have installed is really compatible in your computer system. If its not, maybe that is the problem why you have encountered such problems. You can try installing other merging applications. On the other hand, try to check if you set the ".exe" to "merge.exe" which is incorrect. The proper setting would be "compare.exe".
To resolve merge conflict you can use git mergetool. It runs several merge utilities to resolve merge conflict. You can resolve differences on each file by using file names as parameter with git mergetool. If no file names are specified as parameter then git mergetool will merge conflict on every file.
