Re: Merge question

by syntevo Support-3 :: Rate this Message:

> What command does he do to integrate his branch to trunk such that his
> branch will become no longer a branch, but the actual trunk with his
> new feature?

Modify|Reintegrate Merge is probably the best choice. For details refer to:

http://svnbook.red-bean.com/en/1.5/svn.branchmerge.basicmerging.html

> Does he have to blow away his branch working-copy and re-
> check out the trunk?

In case of Modify|Reintegrate Merge, the branch can't be used anymore.

--
Best regards,
Marc Strapetz
_____________
syntevo GmbH
www.syntevo.com

baby <baby@...> wrote:

> A member of my team checked-out our repo. He then branched to work on
> a new feature.
>
> What command does he do to integrate his branch to trunk such that his
> branch will become no longer a branch, but the actual trunk with his
> new feature? Does he have to blow away his branch working-copy and re-
> check out the trunk?
>
> Thanks,
> b
>
>
> ------------------------------------
>
> Yahoo! Groups Links
>
>
>
>

------------------------------------

Yahoo! Groups Links

<*> To visit your group on the web, go to:
http://groups.yahoo.com/group/smartsvn/

<*> Your email settings:
Individual Email | Traditional

<*> To change settings online go to:
http://groups.yahoo.com/group/smartsvn/join
(Yahoo! ID required)

<*> To change settings via email:
mailto:smartsvn-digest@...
mailto:smartsvn-fullfeatured@...

<*> To unsubscribe from this group, send an email to:
smartsvn-unsubscribe@...

<*> Your use of Yahoo! Groups is subject to:
http://docs.yahoo.com/info/terms/

« Return to Thread: Merge question