fetching https://github.com/ljmf00/dmd.git add-type-aggregate (attempt: 1/3)
From https://github.com/ljmf00/dmd
 * branch            add-type-aggregate -> 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 4412 and retry the command.
CONFLICT (modify/delete): src/dmd/visitor.h deleted in HEAD and modified in 1e93aa0e77ae0af4a6f9eef30eefab6f75ad8088. Version 1e93aa0e77ae0af4a6f9eef30eefab6f75ad8088 of src/dmd/visitor.h left in tree.
CONFLICT (modify/delete): src/dmd/tocsym.d deleted in HEAD and modified in 1e93aa0e77ae0af4a6f9eef30eefab6f75ad8088. Version 1e93aa0e77ae0af4a6f9eef30eefab6f75ad8088 of src/dmd/tocsym.d left in tree.
CONFLICT (modify/delete): src/dmd/strictvisitor.d deleted in HEAD and modified in 1e93aa0e77ae0af4a6f9eef30eefab6f75ad8088. Version 1e93aa0e77ae0af4a6f9eef30eefab6f75ad8088 of src/dmd/strictvisitor.d left in tree.
CONFLICT (modify/delete): src/dmd/semantic3.d deleted in HEAD and modified in 1e93aa0e77ae0af4a6f9eef30eefab6f75ad8088. Version 1e93aa0e77ae0af4a6f9eef30eefab6f75ad8088 of src/dmd/semantic3.d left in tree.
CONFLICT (modify/delete): src/dmd/parsetimevisitor.d deleted in HEAD and modified in 1e93aa0e77ae0af4a6f9eef30eefab6f75ad8088. Version 1e93aa0e77ae0af4a6f9eef30eefab6f75ad8088 of src/dmd/parsetimevisitor.d left in tree.
CONFLICT (modify/delete): src/dmd/opover.d deleted in HEAD and modified in 1e93aa0e77ae0af4a6f9eef30eefab6f75ad8088. Version 1e93aa0e77ae0af4a6f9eef30eefab6f75ad8088 of src/dmd/opover.d left in tree.
CONFLICT (modify/delete): src/dmd/mtype.h deleted in HEAD and modified in 1e93aa0e77ae0af4a6f9eef30eefab6f75ad8088. Version 1e93aa0e77ae0af4a6f9eef30eefab6f75ad8088 of src/dmd/mtype.h left in tree.
CONFLICT (modify/delete): src/dmd/mtype.d deleted in HEAD and modified in 1e93aa0e77ae0af4a6f9eef30eefab6f75ad8088. Version 1e93aa0e77ae0af4a6f9eef30eefab6f75ad8088 of src/dmd/mtype.d left in tree.
CONFLICT (modify/delete): src/dmd/lambdacomp.d deleted in HEAD and modified in 1e93aa0e77ae0af4a6f9eef30eefab6f75ad8088. Version 1e93aa0e77ae0af4a6f9eef30eefab6f75ad8088 of src/dmd/lambdacomp.d left in tree.
CONFLICT (modify/delete): src/dmd/frontend.h deleted in HEAD and modified in 1e93aa0e77ae0af4a6f9eef30eefab6f75ad8088. Version 1e93aa0e77ae0af4a6f9eef30eefab6f75ad8088 of src/dmd/frontend.h left in tree.
CONFLICT (modify/delete): src/dmd/expression.d deleted in HEAD and modified in 1e93aa0e77ae0af4a6f9eef30eefab6f75ad8088. Version 1e93aa0e77ae0af4a6f9eef30eefab6f75ad8088 of src/dmd/expression.d left in tree.
CONFLICT (modify/delete): src/dmd/dtoh.d deleted in HEAD and modified in 1e93aa0e77ae0af4a6f9eef30eefab6f75ad8088. Version 1e93aa0e77ae0af4a6f9eef30eefab6f75ad8088 of src/dmd/dtoh.d left in tree.
CONFLICT (modify/delete): src/dmd/dsymbolsem.d deleted in HEAD and modified in 1e93aa0e77ae0af4a6f9eef30eefab6f75ad8088. Version 1e93aa0e77ae0af4a6f9eef30eefab6f75ad8088 of src/dmd/dsymbolsem.d left in tree.
CONFLICT (modify/delete): src/dmd/dmangle.d deleted in HEAD and modified in 1e93aa0e77ae0af4a6f9eef30eefab6f75ad8088. Version 1e93aa0e77ae0af4a6f9eef30eefab6f75ad8088 of src/dmd/dmangle.d left in tree.
CONFLICT (modify/delete): src/dmd/astbase.d deleted in HEAD and modified in 1e93aa0e77ae0af4a6f9eef30eefab6f75ad8088. Version 1e93aa0e77ae0af4a6f9eef30eefab6f75ad8088 of src/dmd/astbase.d left in tree.
Automatic merge failed; fix conflicts and then commit the result.