27 Aug
svn merge
(this is one of those “so I remember it” posts that might help others)
Edit: See below for a more accurate way to merge the trunk back into HEAD
I’ve got some code that I’m storing in SVN. In traditional SVN form, I’ve got my repo set up as
/trunk
/branches
So my work is done out of trunk, [...]