[TSVN] Re: Getting confused with feature branch merge

Simon Large <simon <at> skirridsystems.co.uk> writes:

> First mistake - quote from TSVN help file:
> "All trunk changes have been ported to the feature branch, week by week,
> and now the feature is complete you want to merge it back into the trunk."
>
> You seem to have missed out r21 and r23 on trunk, so by merging the
> feature branch back, you will discard those trunk changes.

Thanks, I have a clearer picture now. I'm trying to create the situation that
someone commits into the trunk while the branch is merging back.

So the merge policy is, I should always merge the latest trunk changes into
branch first, then merge the branch back. This is the part missing from me
previously.

Robin

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Sep 6 08:07:17 2005