Problem when resolving conflicts

Hi,

I'm still relatively new to SVN in general. I set it up on the server
at work when another developer started, and have found it very useful
for a lot of different reasons.

One problem keeps coming back to bite me, though. Now I'm *assuming*
it's a problem with TSVN rather than something in SVN itself.
Basically: after I've resolved a conflict between two files and
committed my changes, the resultant file has been trashed by
whitespace. *All* lines in the file have had an extra blank line
inserted in between.

I've tried reverting the changes, then attempting to perform the merge
again. Same problem.

There was no extra white-space showing when I was resolving the
conflict, so why would it appear after the commit?

I'm guessing it has *something* to do with Windows vs Unix line
endings, however it's really not clear what I should be doing about
it.

Any help greatly appreciated!

Pete Hurst

-- 
If the distro you're using isn't listed above, you can probably work
it out yourself ;-) <Serializer/>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org