[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Conflicts not showing in TortoiseMerge

From: Simon Large <simon.tortoisesvn_at_gmail.com>
Date: Tue, 3 May 2011 16:35:42 +0100

On 3 May 2011 15:01, Campbell Morrison <campbell.morrison_at_gmail.com> wrote:
> Apologies if this is a stupid question, but I'm puzzled.
>
> I've just done a merge and the merge process reports a conflict.   However
> when I launch TortoiseMerge, no conflicts are shown.
>
> Should that be possible?   If so why?

Check your TMerge settings. Is it set to ignore whitespace or
line-ending differences?

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=2729246
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-05-03 17:35:42 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.