Tree conflict on checkout

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:

I just tried a clean checkout now - works fine.

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

Eli

Daniel Dilts <diltsman@gmail.com> writes:

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'

Looks to me like r220958 moved the Ocaml directory to OCaml, but the
empty Ocaml directory stuck around. I think it's fixed in r220971.

Looks good. Thanks, Justin.