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

We have tab settings as part of our company-wide coding standards.
Everyone in our company uses two-character tabs using spaces, not tabs.
  Other companies may choose different settings, but just make sure that
everyone who touches your files are using the same settings. Makes sure
that these needless merge conflicts never happen.

Sly

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

---------------------------------------------------------------------
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:57:20 2004