On Tue, May 18, 2010 at 11:57:21PM +0200, Stefan Sperling wrote: > # Reintegrate the feature2 branch > svn up $trunk > svn merge --reintegrate $feature2_url $trunk > svn ci $trunk -m "reintegrate bugfix from feature2 branch"
In case that "bugfix" comment confuses you, this should have read: svn ci $trunk -m "reintegrate feature2 branch into trunk" Stefan
