Re: Using Branches

On Sun, Dec 7, 2008 at 07:23, Megs <neilcowie.mirkwood_at_virgin.net> wrote:
> I am part of a embedded software / firmware development group which
> use the following structure with TSVN,
> trunk - reviewed code / potential release code.
> tags - used for tagging release code.
> branches - private workspace for developing code or fixing defects.
>
> The question I have is when I branch from the trunk and work within
> this branch, if someone was to branch from my branch, how do we
> synchronise? We both update from the trunk on a regular basis but how
> should we synchronise together and when the work is completed who
> should commit to the trunk?

You'd synchronize the same way you sync changes from trunk to your
branch - merge.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=980747

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2008-12-08 09:54:30 CET