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

Re: [TSVN] entire file in conflict?

From: Norbert Unterberg <nunterberg_at_gmail.com>
Date: 2005-09-24 08:46:15 CEST

2005/9/24, Eric Hanchrow <offby1@blarg.net>:

> I was doing a merge, and had lots of conflicts. One file appeared to
> conflict on every line: that is, the left pane showed a big blank
> area, followed by the complete text of the file in red; the right pane
> showed the complete text of the file in red followed by a big blank
> area. (In fact, the actual conflict was just a few lines.)

> What might be causing this?

This can happen when someone changed the end-of-line style (see
svn:eol-style property) of the file or changed the line endings in the
file. You might whant to check the "Ignore line endings" setting in
TortoiseMerge settings.

Norbert

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sat Sep 24 08:46:32 2005

This is an archived mail posted to the TortoiseSVN Dev mailing list.