I\'m pretty used to how to do CVS merges in Eclipse, and I\'m otherwise happy with the way that both Subclipse and Subversive work with the SVN repository, but I\'m not quite su
I typically check out both branches and then use the compare to each other option which does a synchronize-like compare of the two source trees. After integrating the changes into one branch, you can recommit back to the repository.