Re: Question
From: Stefan Sperling <stsp_at_elego.de>
Date: Thu, 8 Dec 2011 12:05:27 +0100
On Wed, Dec 07, 2011 at 04:23:09PM -0700, Randall Reynolds wrote:
Hard to say. It depends entirely on the parameters you passed to the
With the 'merge 2 branches' option, if you don't understand 100% what
See http://subversion.apache.org/docs/svn-merge.txt for a short conceptual
> What should I do to make the branch match the trunk, in this case? How can
To merge from the trunk to the branch try using the first ("Merge a
To merge the other way (branch back into trunk), use the 'reintegrate' option.
The 'merge 2 branches' option is only necessary for more complex cases.
|
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.