views:

425

answers:

1

I would like to do exactly as the subject says. It's not possible to merge the current branch to the trunk yet, otherwise, that's what I'd do. The subbranch (or whatever the term is) will be merged with the branch and then the branch back to the trunk.

Theoretically, this should work - does anyone see any problems with this? Thanks in advance.

+4  A: 

No, that sounds perfectly fine to me.

The only time you might have a problem is if you tried to merge the child branch directly into the trunk.

Garry Shutler
I don't see any problem merging the child branch directly to trunk. the only problem might be if you want to merge the child to trunk and *later* merge the parent branch to trunk - I don't expect this to go down well.
Guss
I just quickly tried this myself on a local repository and a trivial example. Using --reintegrate to collapse the branches back again worked fine.
Jim T