SVN/BranchMergeReintegrateToTrunk

This page covers reintegration of a branch back into the trunk copy.

• Go to the trunk

svn up

• Go to the branch

svn up
svn merge ^/trunk

resolve any conflicts!

svn ci -m "mybranch: merge of trunk changes to mybranch."
svn up

• Go to the trunk

svn up
svn merge --reintegrate ^/mybranch
svn ci -m "trunk: merged mybranch back into trunk!"