Re: Merging Branch back to Trunk
From: Ted Stern <dodecatheon_at_gmail.com>
Date: Fri, 06 Feb 2009 16:03:45 -0800
On 06 Feb 2009 15:37:41 -0800, Alexey Kulikov wrote:
That's not my understanding of how a proper merge works.
The branch should contain all changes related specifically to the
So you are *not* doing a merge of diffs between the branch root and
There should be no conflicts if you have indeed kept the branch
How this works with svn:mergeinfo, I have no idea.
Ted
-- Frango ut patefaciam -- I break so that I may reveal ------------------------------------------------------ http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1115373 To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].Received on 2009-02-07 01:04:37 CET |
This is an archived mail posted to the Subversion Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.