fetching https://github.com/MoonlightSentinel/dmd.git context/non-root-modules (attempt: 1/3) From https://github.com/MoonlightSentinel/dmd * branch context/non-root-modules -> 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 4349 and retry the command. Auto-merging src/dmd/mars.d CONFLICT (content): Merge conflict in src/dmd/mars.d CONFLICT (modify/delete): src/dmd/id.d deleted in HEAD and modified in d07a44a7d397d82e66c905139395c7d4001b9d90. Version d07a44a7d397d82e66c905139395c7d4001b9d90 of src/dmd/id.d left in tree. CONFLICT (modify/delete): src/dmd/dtemplate.d deleted in HEAD and modified in d07a44a7d397d82e66c905139395c7d4001b9d90. Version d07a44a7d397d82e66c905139395c7d4001b9d90 of src/dmd/dtemplate.d left in tree. CONFLICT (modify/delete): src/dmd/dmodule.d deleted in HEAD and modified in d07a44a7d397d82e66c905139395c7d4001b9d90. Version d07a44a7d397d82e66c905139395c7d4001b9d90 of src/dmd/dmodule.d left in tree. Automatic merge failed; fix conflicts and then commit the result.