What is the proper way to do a Subversion merge in Eclipse?

Question

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

Answer 1

Use Eclipse integration, it works perfectly fine.

The main change from CVS, is that you only merge deltas from a branch, ie changes from one revision to another. That is to say you have to track the correct start revision somehow (unless you have svn 1.5 merge history)

If you got that right, it's only up to you to get the changes right with the compare editor.