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

RE: Re: Cannot find the conflicted files after merge

From: tailorbird <tailorbird.restless_at_gmail.com>
Date: Thu, 1 May 2014 20:47:27 -0700 (PDT)

Much thanks!

I have asked this question in SO also. One of the answers says, "Merge two different trees" must not be used in this case.
I am going to use the doc you have provided and to use the Check for Modifications dialog to access the Edit conflicts option.

http://stackoverflow.com/questions/23388245/cannot-find-the-tree-conflicted-files-after-merge

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-05-02 05:47:32 CEST

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