fetching https://github.com/nordlow/dmd.git add-traits-hasAliasing (attempt: 1/3)
From https://github.com/nordlow/dmd
 * branch            add-traits-hasAliasing -> 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 4139 and retry the command.
CONFLICT (modify/delete): src/dmd/traits.d deleted in HEAD and modified in 271fba307d439f610716a82d19eb30a71a19f258. Version 271fba307d439f610716a82d19eb30a71a19f258 of src/dmd/traits.d left in tree.
CONFLICT (modify/delete): src/dmd/mtype.d deleted in HEAD and modified in 271fba307d439f610716a82d19eb30a71a19f258. Version 271fba307d439f610716a82d19eb30a71a19f258 of src/dmd/mtype.d left in tree.
CONFLICT (modify/delete): src/dmd/id.d deleted in HEAD and modified in 271fba307d439f610716a82d19eb30a71a19f258. Version 271fba307d439f610716a82d19eb30a71a19f258 of src/dmd/id.d left in tree.
CONFLICT (modify/delete): src/dmd/frontend.h deleted in HEAD and modified in 271fba307d439f610716a82d19eb30a71a19f258. Version 271fba307d439f610716a82d19eb30a71a19f258 of src/dmd/frontend.h left in tree.
Automatic merge failed; fix conflicts and then commit the result.