How to use visual merging tools?

Question

I can't get my head around KDiff3 or Beyond Compare in the merge mode. Is there any tutorial to this feature?

Gastrology

I personally like to have good old conflict markers in the source – Pecoraro

Answer 1

Here's a video showing how to use Beyond Compare to merge files. It was given as part of Embarcadero's CodeRage 5 conference, so it covers a lot of general usage as well. The merge part begins at about 13:00.

Fendley

The merge tutorial starts at minute 13 and ends at 20 – Gastrology

@Reinis Thanks, we now have a copy on our site and I've updated the link. – Toland

Answer 2

I found one tutorial at

http://kdiff3.sourceforge.net/doc/merging.html

Gastrology

Answer 3

http://kdiff3.sourceforge.net/doc/merging.html this link might help you. but some rare facts are not considered at this link ...like "line end style"...for further conflicts

Rothstein