[LLVMdev] Tree conflict on checkout

[Eli Bendersky]

I just tried a clean checkout now - works fine.

This still sounds like some conflict with a local directory you have.

Eli

On Fri, Oct 31, 2014 at 10:05 AM, Daniel Dilts <diltsman at gmail.com> wrote:

> I am getting the following error while trying to checkout LLVM.  I deleted
> my local copy (no changes) just in case something was causing the issue,
> but it didn't fix it.
>
> Tree conflict on 'llvm\test\Bindings\Ocaml'
>    > local dir unversioned, incoming dir add upon update
> Select: (r) mark resolved, (p) postpone, (q) quit resolution, (h) help:
>
> _______________________________________________
> LLVM Developers mailing list
> LLVMdev at cs.uiuc.edu         http://llvm.cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvmdev
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-dev/attachments/20141031/dc7e700c/attachment.html>