Sourcetree conflict resolution: Xcode FileMerge or Araxis Merge

Michael Brian Bentley

When resolving conflicts, I've set merge to FileMerge and Araxis Merge (under preferences>diff) to see how they work. When using FileMerge, the conflict resolution involves two files, but Araxis Merge [2012 pro eval] displays three. It is a little irritating because the third file, .BASE, doesn't seem necessary and in fact complicates the resolution process. I would like to use Araxis Merge.

stevestreeting

Merging a conflict always involves at least 3 files:

1. The version on your own branch you had before you started merging
2. The version from the other branch that you want to merge together
3. The final merged version

In FileMerge, you see the first two at the top of the screen, and the last one at the bottom.

However, some merge tools also support using the common ancestor of both sides of the merge, which can assist it (and you) in figuring out what to do with a conflict. Araxis is one of those tools, which is why it has an extra BASE file displayed.