On Tue, Apr 29, 2008 at 11:23 AM, Mike Todd <MikeTodd_at_onebookshelf.com> wrote:
> Here's the scenario: we have our trunk, and a dev branch which was created
> from revision 300 of the trunk. Sometimes we'll find a bug, fix it on
> trunk, and want to merge that fix back into dev, when that same file has
> also changed on dev. Here's the commands we run:
>
> cd branches/dev
> svn merge -r300:HEAD http://svn.example.org/foo/trunk/file.php file.php
>
> However, this results in a conflict, and when I open branches/dev/file.php,
> it shows the entirety of the dev version, =======, then the entirety of the
> trunk version below that. Even though in the test case I ran just now, the
> files are exactly the same other than one line added to dev, and one line
> (in a different place) added to the trunk version.
Are the EOL markers different in trunk vs. the branch?
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-04-29 17:50:33 CEST