[LLVMdev] Tree conflict on checkout (original) (raw)
Cameron McInally cameron.mcinally at nyu.edu
Fri Oct 31 10:44:51 PDT 2014
- Previous message: [LLVMdev] Tree conflict on checkout
- Next message: [LLVMdev] TSFlags in AsmBackend
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
On Fri, Oct 31, 2014 at 1:22 PM, Justin Bogner <mail at justinbogner.com> wrote:
Daniel Dilts <diltsman at 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.
- Previous message: [LLVMdev] Tree conflict on checkout
- Next message: [LLVMdev] TSFlags in AsmBackend
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]