How can I fix merge conflicts in Araxis Merge 6?

Asked By Justin Fraank 0 points N/A Posted on - 04/06/2013

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.

• Status: Open
• Question Views: 1011
• Answer Count: 2
• Vote Up 0 Vote Down

• Answer Accepted: Yes
• Question Category: Business Management

Best Answer by Walker Burkhead

Go To Solution

Best Answer

Best Answer

Answered By Walker Burkhead 0 points N/A #145461

How can I fix merge conflicts in Araxis Merge 6?

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".

About Walker Burkhead

Questions
0

Answers
13

Best Answers
5

• Vote Up 0 Vote Down

• Posted on - 04/26/2013
• Question Category: Business Management

Answered By Rebekah J Anderson 20 points N/A #145462

How can I fix merge conflicts in Araxis Merge 6?

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.

About Rebekah J Anderson

Questions
18

Answers
19

Best Answers
6

• Vote Up 0 Vote Down

• Posted on - 04/29/2013
• Question Category: Business Management