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

Conflicts not showing in TortoiseMerge

From: Campbell Morrison <campbell.morrison_at_gmail.com>
Date: Tue, 3 May 2011 15:01:26 +0100

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?

Thanks,

Campbell

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2729046

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-05-03 16:02:55 CEST

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