Re: EOL errors when using merge

2009/2/4 Jackson, Paul A. <Paul_Jackson_at_g1.com>:
> I am encountering problems with conflicting EOL characters when merging from
> Trunk to a Feature branch. The files in both the Trunk and Feature Branch
> have Windows-style CRLF EOL characters, however, when I merge, certain files
> appear as having conflicting EOLs. I did try the ignore EOL option as well
> as ignore all whitespace, however, still some files appear conflicted and
> the diff tool seems even more confused (the attached PNG is for this
> ignoring EOL/whitespace case, where I get this section of orange and
> question marks in the merged copy.).
>
> Any ideas on what could be going wrong here?

Are you ignoring EOLs in TortoiseMerge or are you ignoring EOLs when
you do the merge? The latter may require server support, not sure.

Simon

-- 
:       ___
:  oo  // \\      "De Chelonian Mobile"
: (_,\/ \_/ \     TortoiseSVN
:   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
:   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1104116
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].