[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: Marshall <mamills.gseit_at_gmail.com>
Date: Thu, 5 Sep 2013 08:42:23 -0700 (PDT)

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


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-09-05 17:42:27 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.