Subversion merging, tree merge
Posted
by krystan honour
on Stack Overflow
See other posts from Stack Overflow
or by krystan honour
Published on 2010-05-25T10:45:22Z
Indexed on
2010/05/25
11:11 UTC
Read the original article
Hit count: 356
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 head and then keep people working on their current working copies.
So my question is , can tree merge be used to solve this or do I have to reintegrate and recreate.
© Stack Overflow or respective owner