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

Tree conflict

From: <kloertscher_at_ups.com>
Date: Fri, 17 Jan 2014 18:07:00 -0500

I have a tree conflict on one of the folders in my working copy. All attempts to clear the conflict have failed. I have tried to delete my local copy and then do a checkout from the repo browser, but when it restores the folder and all of its contents, the conflict still remains. How can I get rid of this and start fresh with this folder?

kloertscher

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-01-18 00:07:14 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.