fetching https://github.com/SSoulaimane/dmd.git fix17141_refactor (attempt: 1/3)
From https://github.com/SSoulaimane/dmd
 * branch            fix17141_refactor -> 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 3863 and retry the command.
CONFLICT (modify/delete): src/dmd/mtype.h deleted in HEAD and modified in febd7bcf415d3c0ef809b288599771062d8d0a4c. Version febd7bcf415d3c0ef809b288599771062d8d0a4c of src/dmd/mtype.h left in tree.
CONFLICT (modify/delete): src/dmd/mtype.d deleted in HEAD and modified in febd7bcf415d3c0ef809b288599771062d8d0a4c. Version febd7bcf415d3c0ef809b288599771062d8d0a4c of src/dmd/mtype.d left in tree.
CONFLICT (modify/delete): src/dmd/dcast.d deleted in HEAD and modified in febd7bcf415d3c0ef809b288599771062d8d0a4c. Version febd7bcf415d3c0ef809b288599771062d8d0a4c of src/dmd/dcast.d left in tree.
CONFLICT (modify/delete): src/dmd/astbase.d deleted in HEAD and modified in febd7bcf415d3c0ef809b288599771062d8d0a4c. Version febd7bcf415d3c0ef809b288599771062d8d0a4c of src/dmd/astbase.d left in tree.
Automatic merge failed; fix conflicts and then commit the result.