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?
Thanks a bunch for your help. You clearly spend a lot of time
answering these emails and I really appreciate it.
Stephen
On 11/16/07, Stefan Küng <tortoisesvn@gmail.com> wrote:
> Stephen Dewey wrote:
> > Ok... well I looked at a few more files and it seems that I do get the
> > menus in the bottom pane ONLY when they are bright red signifying an
> > inline conflict. In other cases, there are some lines that are light
> > red (signifying deletion) and other lines that are light green
> > (signifying addition) and I only get the options in the upper right
> > pane. I can't get options in the upper left or bottom pane in those
> > cases, even if I highlight. Maybe that is intentional? Also, in these
> > cases, the lower right-hand corner states "conflicts: 0". So I wonder
> > why it got marked as conflicted in the first place, because it started
> > out with 0 conflicts.
>
> If Subversion marked the file as in conflict, but TortoiseMerge shows
> you 0 conflicts, then you have set TortoiseMerge to ignore some changes,
> most likely line endings and/or whitespace changes.
> In that case, TortoiseMerge doesn't show you a conflict, but for
> Subversion (and TortoiseSVN) the conflict still exists.
>
> 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
>
>
Received on Sun Nov 18 21:50:39 2007