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
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/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/aggregate.h deleted in HEAD and modified in 0340cf1edbdfab49dd252bbf7e7ec0e9a8ec8661. Version 0340cf1edbdfab49dd252bbf7e7ec0e9a8ec8661 of src/dmd/aggregate.h left in tree.
CONFLICT (file location): test/runnable/test10442.d added in 0340cf1edbdfab49dd252bbf7e7ec0e9a8ec8661 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to druntime/test/gc/test10442.d.
CONFLICT (file location): test/runnable/imports/test10442a.d added in 0340cf1edbdfab49dd252bbf7e7ec0e9a8ec8661 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to druntime/test/gc/imports/test10442a.d.
Auto-merging compiler/src/dmd/typinf.d
CONFLICT (content): Merge conflict in compiler/src/dmd/typinf.d
Auto-merging compiler/src/dmd/toobj.d
Auto-merging compiler/src/dmd/todt.d
Auto-merging compiler/src/dmd/expressionsem.d
CONFLICT (content): Merge conflict in compiler/src/dmd/expressionsem.d
Auto-merging compiler/src/dmd/expression.d
CONFLICT (content): Merge conflict in compiler/src/dmd/expression.d
Auto-merging compiler/src/dmd/cond.d
Auto-merging compiler/src/dmd/astbase.d
CONFLICT (content): Merge conflict in compiler/src/dmd/astbase.d
Auto-merging compiler/src/dmd/aggregate.d
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 2303 and retry the command.
Automatic merge failed; fix conflicts and then commit the result.