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

> 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!

Cheers
- 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