Tools for SVN Merging

Question

SVN merging is very time consuming (especially on large code bases) and error prone. Eclipse and Netbeans plugins don\'t serve me very well. At the moment I\'m using a combi

Answer 1

Which platform are you running on? On Windows I use TortoiseSVN to carry out most diffs and merges pretty easily. Only some of the more complicated strands of diffs are performed with UltraCompare.

Answer 2

Best tool I've currently found for Linux is submerge from subcommander package. Here is how to use this and integrate with eclipse.

Answer 3

I've used svnmerge and it helps a lot. It's a command line utility, so it may not be the best tool for everyone, but it's good for me.

Answer 4

I really like Sourcegear Diffmerge. http://www.sourcegear.com/diffmerge/