Reputation: 90475
I can't get my head around KDiff3 or Beyond Compare in the merge mode. Is there any tutorial to this feature?
Upvotes: 7
Views: 4373
Reputation: 13312
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.
Upvotes: 3
Reputation: 5186
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
Upvotes: 0
Reputation: 90475
I found one tutorial at
http://kdiff3.sourceforge.net/doc/merging.html
Upvotes: 2