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

Re: [TSVN] Tortoise does not show conflict after conflicted merge

From: SteveKing <stefankueng_at_gmail.com>
Date: 2004-10-27 08:45:13 CEST

On Wed, 27 Oct 2004 08:42:31 +0200, Thomas Börkel <tbo@ap-ag.com> wrote:
> You are right. It shows the conflict, if I activate "compare whitespaces". But then almost the whole diff is messed up, say unusable.

That means you've changed so much whitespaces that the whole file is
in conflict. Try setting up your editors the next time correctly, or
this will happen again.

> Can't I tell Tortoise or svn to ignore whitespaces in the first place (during the merge)?

Sorry, no.


  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Oct 27 09:47:23 2004

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.