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

Re: Problems Merging from Trunk to Branch

From: Andy Levy <andy.levy_at_gmail.com>
Date: Tue, 29 Apr 2008 12:07:36 -0400

On Tue, Apr 29, 2008 at 12:02 PM, Mike Todd <MikeTodd_at_onebookshelf.com> wrote:
> Andy Levy wrote:
> Are the EOL markers different in trunk vs. the branch?
> That does indeed seem to be the problem -- thanks! Some of our guys are
> editing in Linux and some in Windows, which I assume caused this problem.
> Any advice on solving this? There are a lot of files like this, and it
> would be a major pain to have to manually merge all changes.

Set svn:eol-style=native on your plain-text files.

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 18:08:25 CEST

This is an archived mail posted to the Subversion Users mailing list.