RE: strange problem with subversion merge
From: Giulio Troccoli <Giulio.Troccoli_at_uk.linedata.com>
Date: Tue, 2 Mar 2010 14:18:33 +0000
> >>>> ````````````````
> ````````````````
But these commands are not the same.
From your previous email I understand the bug branch was created as a copy of trunk. What you're trying here is to merge the changes in trunk/typo3conf to a copy of trunk, instead of a copy of trunk/typo3conf.
You seem to be very confused about merging. Maybe you should (re)read the documenation. http://svnbook.red-bean.com/en/1.5/svn.branchmerge.html
Linedata Services (UK) Ltd
|
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.