I cannot get around KDiff3 or Beyond Compare in merge mode. Is there a tutorial for this feature?
Here's a video showing how to use Beyond Compare to merge files. This was given as part of the Embarcadero CodeRage 5 conference, so it also covers a lot in common. Part of the merger begins at about 13:00.
I found one tutorial in
http://kdiff3.sourceforge.net/doc/merging.html
http://kdiff3.sourceforge.net/doc/merging.html this link may help you. but some rare facts are not addressed at this link ... for example, "end of line style" ... for further conflicts