Re: use "their" block in TortoiseMerge

Stephen Dewey wrote:
> Thanks, this is correct. When I turned off ignoring line breaks, I
> went from 0 conflicts to 434 conflicts. I'm wondering, how can I deal
> with this effectively? The other developers are working on either Mac
> or Linux machines, but I'm working on a Windows machine, so we're
> going to get lots of conflicts like this since the different operating
> systems use different EOL characters. The result is that the entire
> file is marked as a conflict. Do you know of a way to avoid this
> issue?

Set the property svn:eol-style to 'native' for all your text files.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org