fetching https://github.com/Geod24/dmd.git fix-5309 (attempt: 1/3)
From https://github.com/Geod24/dmd
 * branch            fix-5309   -> 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 4085 and retry the command.
CONFLICT (modify/delete): src/dmd/traits.d deleted in HEAD and modified in 06626244628eff4c041f21517d8d5b9733eea83c. Version 06626244628eff4c041f21517d8d5b9733eea83c of src/dmd/traits.d left in tree.
CONFLICT (modify/delete): src/dmd/scope.h deleted in HEAD and modified in 06626244628eff4c041f21517d8d5b9733eea83c. Version 06626244628eff4c041f21517d8d5b9733eea83c of src/dmd/scope.h left in tree.
CONFLICT (modify/delete): src/dmd/parse.d deleted in HEAD and modified in 06626244628eff4c041f21517d8d5b9733eea83c. Version 06626244628eff4c041f21517d8d5b9733eea83c of src/dmd/parse.d left in tree.
CONFLICT (modify/delete): src/dmd/hdrgen.d deleted in HEAD and modified in 06626244628eff4c041f21517d8d5b9733eea83c. Version 06626244628eff4c041f21517d8d5b9733eea83c of src/dmd/hdrgen.d left in tree.
CONFLICT (modify/delete): src/dmd/func.d deleted in HEAD and modified in 06626244628eff4c041f21517d8d5b9733eea83c. Version 06626244628eff4c041f21517d8d5b9733eea83c of src/dmd/func.d left in tree.
CONFLICT (modify/delete): src/dmd/frontend.h deleted in HEAD and modified in 06626244628eff4c041f21517d8d5b9733eea83c. Version 06626244628eff4c041f21517d8d5b9733eea83c of src/dmd/frontend.h left in tree.
CONFLICT (modify/delete): src/dmd/dsymbolsem.d deleted in HEAD and modified in 06626244628eff4c041f21517d8d5b9733eea83c. Version 06626244628eff4c041f21517d8d5b9733eea83c of src/dmd/dsymbolsem.d left in tree.
CONFLICT (modify/delete): src/dmd/dsymbol.h deleted in HEAD and modified in 06626244628eff4c041f21517d8d5b9733eea83c. Version 06626244628eff4c041f21517d8d5b9733eea83c of src/dmd/dsymbol.h left in tree.
CONFLICT (modify/delete): src/dmd/dsymbol.d deleted in HEAD and modified in 06626244628eff4c041f21517d8d5b9733eea83c. Version 06626244628eff4c041f21517d8d5b9733eea83c of src/dmd/dsymbol.d left in tree.
CONFLICT (modify/delete): src/dmd/dscope.d deleted in HEAD and modified in 06626244628eff4c041f21517d8d5b9733eea83c. Version 06626244628eff4c041f21517d8d5b9733eea83c of src/dmd/dscope.d left in tree.
CONFLICT (modify/delete): src/dmd/dmangle.d deleted in HEAD and modified in 06626244628eff4c041f21517d8d5b9733eea83c. Version 06626244628eff4c041f21517d8d5b9733eea83c of src/dmd/dmangle.d left in tree.
CONFLICT (modify/delete): src/dmd/cppmanglewin.d deleted in HEAD and modified in 06626244628eff4c041f21517d8d5b9733eea83c. Version 06626244628eff4c041f21517d8d5b9733eea83c of src/dmd/cppmanglewin.d left in tree.
CONFLICT (modify/delete): src/dmd/cppmangle.d deleted in HEAD and modified in 06626244628eff4c041f21517d8d5b9733eea83c. Version 06626244628eff4c041f21517d8d5b9733eea83c of src/dmd/cppmangle.d left in tree.
CONFLICT (modify/delete): src/dmd/attrib.d deleted in HEAD and modified in 06626244628eff4c041f21517d8d5b9733eea83c. Version 06626244628eff4c041f21517d8d5b9733eea83c of src/dmd/attrib.d left in tree.
CONFLICT (modify/delete): src/dmd/astbase.d deleted in HEAD and modified in 06626244628eff4c041f21517d8d5b9733eea83c. Version 06626244628eff4c041f21517d8d5b9733eea83c of src/dmd/astbase.d left in tree.
CONFLICT (modify/delete): src/dmd/aggregate.d deleted in HEAD and modified in 06626244628eff4c041f21517d8d5b9733eea83c. Version 06626244628eff4c041f21517d8d5b9733eea83c of src/dmd/aggregate.d left in tree.
Automatic merge failed; fix conflicts and then commit the result.