[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Re: Docs for reintegration unclear

From: Bob Archer <Bob.Archer_at_amsi.com>
Date: Thu, 5 Sep 2013 17:08:50 +0000

> >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.



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

This is an archived mail posted to the TortoiseSVN Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.