fetching https://github.com/rainers/dmd.git gettypeinfo_in_semantic (attempt: 1/3)
From https://github.com/rainers/dmd
 * branch            gettypeinfo_in_semantic -> FETCH_HEAD

merging FETCH_HEAD
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 3823 and retry the command.
CONFLICT (modify/delete): src/dmd/typinf.d deleted in HEAD and modified in 0340cf1edbdfab49dd252bbf7e7ec0e9a8ec8661. Version 0340cf1edbdfab49dd252bbf7e7ec0e9a8ec8661 of src/dmd/typinf.d left in tree.
CONFLICT (modify/delete): src/dmd/toobj.d deleted in HEAD and modified in 0340cf1edbdfab49dd252bbf7e7ec0e9a8ec8661. Version 0340cf1edbdfab49dd252bbf7e7ec0e9a8ec8661 of src/dmd/toobj.d left in tree.
CONFLICT (modify/delete): src/dmd/todt.d deleted in HEAD and modified in 0340cf1edbdfab49dd252bbf7e7ec0e9a8ec8661. Version 0340cf1edbdfab49dd252bbf7e7ec0e9a8ec8661 of src/dmd/todt.d left in tree.
CONFLICT (modify/delete): src/dmd/semantic3.d deleted in HEAD and modified in 0340cf1edbdfab49dd252bbf7e7ec0e9a8ec8661. Version 0340cf1edbdfab49dd252bbf7e7ec0e9a8ec8661 of src/dmd/semantic3.d left in tree.
CONFLICT (modify/delete): src/dmd/mtype.d deleted in HEAD and modified in 0340cf1edbdfab49dd252bbf7e7ec0e9a8ec8661. Version 0340cf1edbdfab49dd252bbf7e7ec0e9a8ec8661 of src/dmd/mtype.d left in tree.
CONFLICT (modify/delete): src/dmd/expressionsem.d deleted in HEAD and modified in 0340cf1edbdfab49dd252bbf7e7ec0e9a8ec8661. Version 0340cf1edbdfab49dd252bbf7e7ec0e9a8ec8661 of src/dmd/expressionsem.d left in tree.
CONFLICT (modify/delete): src/dmd/expression.d deleted in HEAD and modified in 0340cf1edbdfab49dd252bbf7e7ec0e9a8ec8661. Version 0340cf1edbdfab49dd252bbf7e7ec0e9a8ec8661 of src/dmd/expression.d left in tree.
CONFLICT (modify/delete): src/dmd/dsymbolsem.d deleted in HEAD and modified in 0340cf1edbdfab49dd252bbf7e7ec0e9a8ec8661. Version 0340cf1edbdfab49dd252bbf7e7ec0e9a8ec8661 of src/dmd/dsymbolsem.d left in tree.
CONFLICT (modify/delete): src/dmd/dstruct.d deleted in HEAD and modified in 0340cf1edbdfab49dd252bbf7e7ec0e9a8ec8661. Version 0340cf1edbdfab49dd252bbf7e7ec0e9a8ec8661 of src/dmd/dstruct.d left in tree.
CONFLICT (modify/delete): src/dmd/dcast.d deleted in HEAD and modified in 0340cf1edbdfab49dd252bbf7e7ec0e9a8ec8661. Version 0340cf1edbdfab49dd252bbf7e7ec0e9a8ec8661 of src/dmd/dcast.d left in tree.
CONFLICT (modify/delete): src/dmd/cond.d deleted in HEAD and modified in 0340cf1edbdfab49dd252bbf7e7ec0e9a8ec8661. Version 0340cf1edbdfab49dd252bbf7e7ec0e9a8ec8661 of src/dmd/cond.d left in tree.
CONFLICT (modify/delete): src/dmd/astbase.d deleted in HEAD and modified in 0340cf1edbdfab49dd252bbf7e7ec0e9a8ec8661. Version 0340cf1edbdfab49dd252bbf7e7ec0e9a8ec8661 of src/dmd/astbase.d left in tree.
CONFLICT (modify/delete): src/dmd/aggregate.h deleted in HEAD and modified in 0340cf1edbdfab49dd252bbf7e7ec0e9a8ec8661. Version 0340cf1edbdfab49dd252bbf7e7ec0e9a8ec8661 of src/dmd/aggregate.h left in tree.
CONFLICT (modify/delete): src/dmd/aggregate.d deleted in HEAD and modified in 0340cf1edbdfab49dd252bbf7e7ec0e9a8ec8661. Version 0340cf1edbdfab49dd252bbf7e7ec0e9a8ec8661 of src/dmd/aggregate.d left in tree.
Automatic merge failed; fix conflicts and then commit the result.