svn checkout
svn commit
svn update
svn clean up
svn resolve theirs/mine
svn merge ca 2 
branches
trunk