Re: Tree conflict

On Fri, Jan 17, 2014 at 5:07 PM, <kloertscher_at_ups.com> wrote:
> 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?
>

A "tree conflict" should only ever happen during a merge.

You are never doing a merge on a fresh checkout.

So what *exact steps* do you follow to get this "tree conflict" in a
fresh checkout? What message do you get to tell you that you have a
"tree conflict"? What exact menu item are you choosing from your repo
browser to do a "checkout"?

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-01-21 13:58:18 CET