1

From other questions I gather that the strength of the DVCS, the ease of merges, comes from the fact that each revision knows its parents. Ever since SVN 1.5 came out over 2 years ago, this is also available for SVN. So is there some tool which can use this information and make merges as easy in SVN as it is in DVCS?

Community
  • 1
  • 1
Vilx-
  • 104,512
  • 87
  • 279
  • 422

1 Answers1

0

I'm using p4merge http://www.perforce.com/perforce/products/merge.html

TarasB
  • 2,407
  • 1
  • 24
  • 32
  • We've got Beyond Compare, which is pretty good too. However I cannot find if p4merge can use merge tracking to improve results. Can it? – Vilx- Dec 22 '10 at 09:23