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

Cannot find the conflicted files after merge

From: tailorbird <tailorbird.restless_at_gmail.com>
Date: Wed, 30 Apr 2014 06:31:00 -0700 (PDT)

I was trying to merge from one branch(B1) to another(B2). I have followed the given steps:

Right click on the folder -> Merge... -> Merge two different trees -> From B1 to B2 (HEAD Revision) -> Merge(checked Compare white spaces option by default)

Merge finished with tree conflicts.

The issue is I am not able to find any of the conflicted files inside my folder. But the folder is having the conflict mark on it. Is there anything wrong in the above steps?


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-04-30 15:55:17 CEST

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