merge

Hello

I don't use a lot of the advanced features and so I have a question about
merging. Sorry if this has been asked before.

First, I have a website under /trunk. I have created a branch to add some
specific funtionality that is not implemeneted yet, and not really sure when
it will be implemented. However, I'm still making updates and amends to the
trunk and need to merge these changes to keep the branch up to date.

I have merged the two frequently however I have made a few commits to the
trunk and have not merged lately. So my question is this, when merging
changes in the trunk to a branch, must I merge from the last revision that
was merged or is it ok to merged from the latest revision?

E.g.

Trunk -> last merged INTO branch from trunk r132

Trunk current revision is now 143 after a few updates.

Is it ok to merge r143 into the branch? Will this pickup all the changes? Or
do I need to merge each revision into the branch?

Cheers
Sean

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Mar 6 10:16:22 2007