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?

I personally like to have good old conflict markers in the source — Alex Jasmin, Oct 21 '10 at 18:49

Zoë Peterson · Accepted Answer · 2011-11-17T16:55:18.550

3

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.

edited Nov 17 '11 at 16:55

answered Oct 29 '10 at 21:57

Zoë Peterson

13,094
2
44
64

1

The merge tutorial starts at minute 13 and ends at 20 – Jader Dias Oct 30 '10 at 13:07
1

@Reinis Thanks, we now have a copy on our site and I've updated the link. – Zoë Peterson Nov 17 '11 at 16:57

score 2 · Answer 2 · answered Oct 23 '10 at 20:15

2

I found one tutorial at

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

answered Oct 23 '10 at 20:15

Jader Dias

88,211
155
421
625

score 0 · Answer 3 · answered Oct 31 '11 at 06:19

0

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

answered Oct 31 '11 at 06:19

RollerCosta

5,020
9
53
71

How to use visual merging tools?

3 Answers3