On Sat, May 17, 2008 at 4:40 PM, John Hunter <jd...@gm...> wrote: > - Michael advises making the change on the branch and committing > it. Make sure you svn upped on the trunk and have no local > modifications, and then from the svn trunk do ichael -- what if someone has already made a change on the trunk and wants to merge it to the branch with svnmerge? What is the recommended way to do this? Can they simply go to the branch and do 'svnmerge.py merge'? JDH