Subversion merging, tree merge
- by krystan honour
I need to merge changes from a branch back into trunk but want to continue work on the existing branch.
I was going to use a re-integrate merge but realised this is not suitable as I will need to recreate my branch etc which for a variety of reasons is not desirable.
What I really want to do is merge the current revisions in the branch down to…