2

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.

Goles
  • 11,599
  • 22
  • 79
  • 140
  • Generally, you should use `git` to merge branches and a merge tool such as `xdiff` to help resolve merge conflicts in files. From your question, it sounds like you are OK with using `git` but want help with `xdiff`. Can you confirm that this is the case? – CB Bailey Aug 05 '09 at 16:36
  • Yes Charles, that would be the case. Thank you. – Goles Aug 05 '09 at 17:41
  • In that case, as I don't use xxdiff myself, I'm afraid I can't be much help. Other than point you at the documentation which you probably know about anyway: http://furius.ca/xxdiff/doc/xxdiff-doc.html#merging-files-and-resolving-conflicts . – CB Bailey Aug 05 '09 at 21:33

1 Answers1

5

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

alt text
(source: nerc.ac.uk)

Glorfindel
  • 21,988
  • 13
  • 81
  • 109
VonC
  • 1,262,500
  • 529
  • 4,410
  • 5,250
  • Note that you can also bring up "merged view" if you like such a thing, that shows the results of your selections. – blais Mar 30 '12 at 12:57