For those using eclipse, has anyone ever tried CollabNet eclipse plugin? It's from the same guys that created subclipse. Their interface makes all this merge process smoother and can even prevent you from merging if you don't follow SVN best practices. Regarding merging between different branches, it allows to pick which which commit you plan to merge if you don't want to merge all.
João Fernandes
