RE: Re: Docs for reintegration unclear

> >It doesn't matter what kind of merge you're doing. You ALWAYS do the
> >merge in a working copy pointing to the path you want the final changes
> >on.
>
> Thanks Ben, _that_ made perfect sense.
>
> So, if I'm using my trunk working copy to reintegrating my branch; which
> merge should I use?
> * Merge a range of revisions (p101, 103)
> * Merge two different trees (p101, 107)
> * merge reintegrate... (p107)
>
> The doc says all 3 are a type of reintegration; but I'm not clear on the
> differences.

Generally, you will use Reintegrate. This is usually for the feature branch use case.

In 1.8.x you don't have to make the choice, svn will figure it out for you.

BOb

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-09-05 19:09:03 CEST