Question

I want to use xxdiff for my merging needs. I have just started using git, and I integrated xxdiff to work with it on (git mergetool).

My problem is that I can’t find any resource that teaches the basic of merging branches with xxdiff, so I get into this three file window with LOCAL BASE REMOTE, but I don’t know where to start to get my merge done.

Could anyone point me to a good resource to learn xxdiff merge basics quickly ?

Thank you very much.

Answer 1

If you did setup xxdiff like I illustrated with those git settings (replace ‘difftool’ by ‘mergetool’ in your instance), you have then to compare those three files and resolve the differences.
Note: regarding Git, xxdiff is part of the tools automatically recognized by the mergetool setting.

I am not sure there is anything xxdiff-specific in the resolution of a three-way merge. You can see an illustration of such a merge in term of versions being compared here.
The resolution is quite similar to other diff graphical tools.
Here is a xxdiff resolution tutorial (not exactly xxdiff-centric, but still useful).

_{(source: nerc.ac.uk)}