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

Re: Docs for reintegration unclear

From: Ben Fritz <fritzophrenic_at_gmail.com>
Date: Wed, 4 Sep 2013 18:00:42 -0500

On Wed, Sep 4, 2013 at 1:15 PM, Marshall <mamills.gseit_at_gmail.com> wrote:
> My root question would be: do I use the branch or trunk working copy to reintegrate a featured branch back into the trunk?
>

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.

So if you're re-integrating the branch to trunk, that means you want
the changes to be on trunk, that means your working copy must be on
trunk.

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

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