newbie question

I have my 'trunk' which is the code in operation.
I have made a 'tag' version of that so they are identical.
I have been working on a branch which was made from the trunk.

I am working on my workstation, where the 'tag' and 'trunk' have been
fully checked out from the repository and are current.

I have been making the changes to the 'branch' locally, some of the
changes have been committed to the repository.

I want to merge my 'branch' back into the 'trunk'.

Do I merge the 'branch' version with the 'tag' version into the
'trunk' ?

I am somewhat confused on this. Also I am planning on doing this on my
workstation and then 'committing' the changes on the trunk back to the
repository...is that how it's all done?

Thanks

Craig

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Mar 21 05:24:34 2006