[LLVMdev] Tree conflict on checkout

[Daniel Dilts]

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:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-dev/attachments/20141031/6686f084/attachment.html>