fetching https://github.com/DmitryOlshansky/dmd.git dcache (attempt: 1/3) From https://github.com/DmitryOlshansky/dmd * branch dcache -> 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 4458 and retry the command. Auto-merging src/win32.mak CONFLICT (content): Merge conflict in src/win32.mak Auto-merging src/posix.mak CONFLICT (content): Merge conflict in src/posix.mak CONFLICT (modify/delete): src/dmd/parse.d deleted in HEAD and modified in 3813b7d447873890c65fda55c3457d1c86cc97d5. Version 3813b7d447873890c65fda55c3457d1c86cc97d5 of src/dmd/parse.d left in tree. CONFLICT (modify/delete): src/dmd/module.h deleted in HEAD and modified in 3813b7d447873890c65fda55c3457d1c86cc97d5. Version 3813b7d447873890c65fda55c3457d1c86cc97d5 of src/dmd/module.h left in tree. Auto-merging src/dmd/mars.d CONFLICT (content): Merge conflict in src/dmd/mars.d CONFLICT (modify/delete): src/dmd/hdrgen.d deleted in HEAD and modified in 3813b7d447873890c65fda55c3457d1c86cc97d5. Version 3813b7d447873890c65fda55c3457d1c86cc97d5 of src/dmd/hdrgen.d left in tree. CONFLICT (modify/delete): src/dmd/globals.d deleted in HEAD and modified in 3813b7d447873890c65fda55c3457d1c86cc97d5. Version 3813b7d447873890c65fda55c3457d1c86cc97d5 of src/dmd/globals.d left in tree. CONFLICT (modify/delete): src/dmd/expressionsem.d deleted in HEAD and modified in 3813b7d447873890c65fda55c3457d1c86cc97d5. Version 3813b7d447873890c65fda55c3457d1c86cc97d5 of src/dmd/expressionsem.d left in tree. CONFLICT (modify/delete): src/dmd/dsymbol.d deleted in HEAD and modified in 3813b7d447873890c65fda55c3457d1c86cc97d5. Version 3813b7d447873890c65fda55c3457d1c86cc97d5 of src/dmd/dsymbol.d left in tree. CONFLICT (modify/delete): src/dmd/dscope.d deleted in HEAD and modified in 3813b7d447873890c65fda55c3457d1c86cc97d5. Version 3813b7d447873890c65fda55c3457d1c86cc97d5 of src/dmd/dscope.d left in tree. CONFLICT (modify/delete): src/dmd/dmodule.d deleted in HEAD and modified in 3813b7d447873890c65fda55c3457d1c86cc97d5. Version 3813b7d447873890c65fda55c3457d1c86cc97d5 of src/dmd/dmodule.d left in tree. CONFLICT (modify/delete): src/dmd/dinterpret.d deleted in HEAD and modified in 3813b7d447873890c65fda55c3457d1c86cc97d5. Version 3813b7d447873890c65fda55c3457d1c86cc97d5 of src/dmd/dinterpret.d left in tree. CONFLICT (modify/delete): src/dmd/cli.d deleted in HEAD and modified in 3813b7d447873890c65fda55c3457d1c86cc97d5. Version 3813b7d447873890c65fda55c3457d1c86cc97d5 of src/dmd/cli.d left in tree. Automatic merge failed; fix conflicts and then commit the result.