[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: Lübbe Onken <l.onken_at_rac.de>
Date: 2004-10-27 09:00:31 CEST

> You are right. It shows the conflict, if I activate "compare
> whitespaces". But then almost the whole diff is messed up,
> say unusable.
As a workaround checkout the file you want to merge to a different location
and run a code formatter on it (or open it in your editor and save it with
the correct whitespace settings). We are using code formatters here.
Hitting<Ctrl-D><Enter> has become second nature to me, like hitting <Ctrl-S>
all the time :-)
It makes life a lot easier in collaborative projects!

- Lübbe

  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 10:07:25 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.