fetching https://github.com/TurkeyMan/druntime.git stdcpp (attempt: 1/3) From https://github.com/TurkeyMan/druntime * branch stdcpp -> FETCH_HEAD merging FETCH_HEAD CONFLICT (modify/delete): src/core/stdcpp/typeinfo.d deleted in HEAD and modified in fca0fb528407b1ca870207d9bff79ee7264500c2. Version fca0fb528407b1ca870207d9bff79ee7264500c2 of src/core/stdcpp/typeinfo.d left in tree. CONFLICT (modify/delete): src/core/stdcpp/exception.d deleted in HEAD and modified in fca0fb528407b1ca870207d9bff79ee7264500c2. Version fca0fb528407b1ca870207d9bff79ee7264500c2 of src/core/stdcpp/exception.d left in tree. CONFLICT (file location): src/core/stdcpp/vector.d added in fca0fb528407b1ca870207d9bff79ee7264500c2 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to old/src/core/sys/posix/stdcpp/vector.d. CONFLICT (file location): src/core/stdcpp/utility.d added in fca0fb528407b1ca870207d9bff79ee7264500c2 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to old/src/core/sys/posix/stdcpp/utility.d. CONFLICT (file location): src/core/stdcpp/type_traits.d added in fca0fb528407b1ca870207d9bff79ee7264500c2 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to old/src/core/sys/posix/stdcpp/type_traits.d. CONFLICT (file location): src/core/stdcpp/tuple.d added in fca0fb528407b1ca870207d9bff79ee7264500c2 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to old/src/core/sys/posix/stdcpp/tuple.d. CONFLICT (file location): src/core/stdcpp/string.d added in fca0fb528407b1ca870207d9bff79ee7264500c2 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to old/src/core/sys/posix/stdcpp/string.d. CONFLICT (file location): src/core/stdcpp/array.d added in fca0fb528407b1ca870207d9bff79ee7264500c2 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to old/src/core/sys/posix/stdcpp/array.d. CONFLICT (file location): src/core/stdcpp/allocator.d added in fca0fb528407b1ca870207d9bff79ee7264500c2 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to old/src/core/sys/posix/stdcpp/allocator.d. Auto-merging old/mak/SRCS Auto-merging old/mak/COPY CONFLICT (content): Merge conflict in old/mak/COPY CONFLICT (modify/delete): mak/DOCS deleted in HEAD and modified in fca0fb528407b1ca870207d9bff79ee7264500c2. Version fca0fb528407b1ca870207d9bff79ee7264500c2 of mak/DOCS left in tree. Automatic merge failed; fix conflicts and then commit the result.