merging an svn branch back into trunk: step-by-step intructions