RE: Merge - Reintegrate branch

> So Merge command -> Reintegrate branch
> Here I have to select the tree for merge, when I press the browse
button
> to fill "From URL" edit box --> a Browse for folder dialog is
shown....
> I select my folder and then i test merge --> I got an error.
> I think that browse should be done on server URL, so I tried typing
the
> server url with my branch path --> all is ok.

If you create a trunk, then create a branch. Then you want to merge
changes made into the branch back into the trunk you only need to do a
merge from branch to trunk.

Only use reintegrate if you have merged trunk into branch to keep the
branch up to date. Also, once you re-integrate you must delete the
branch to avoid possible problems in the future. Reintegrate is
basically used when doing a feature branch.

BOb

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-02-04 17:37:54 CET