Posted 2011/05/18
Merging SVN feature branches
I make all major software changes in an SVN feature branch but I can never quite remember how to merge the branch back into trunk. Check out a clean version of trunk and then use this recipe:
svn merge https://svnserver.com/svn/repo/trunk/project@999 https:///svnserver.com/repo/branches/project/feature .
(All on one line).
999 is the revision number when you copied the trunk into the feature branch.