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
Best tool I've currently found for Linux is submerge from subcommander package. Here is how to use this and integrate with eclipse.