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
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.