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


From: Mark Williams <mark_at_techop.co.uk>
Date: Wed, 13 Nov 2013 02:17:23 -0800 (PST)

I am trying to merge some changes from a branch to the trunk. In the past some of the files have been moved from one directory to another. This move was successfully merged and checked in in the past.

When I try to merge the new changes I am getting tree conflicts for the files that were deleted as part of the previous 'move'. If I try to select the conflict and resolve it I get an error saying the file does not exist!


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-11-13 12:05:30 CET

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