You very much cannot do merging easily in SVN, even with tortoise (which has a wizard which helps with the options). I have never had a clean merge with SVN, e

You very much cannot do merging easily in SVN, even with tortoise (which has a wizard which helps with the options). I have never had a clean merge with SVN, ever. Whereas with git/bzr and friends doing "merge <otherbranch>" just works most of the time.