fetching https://github.com/jacob-carlborg/dmd.git serializer-basic-types (attempt: 1/3)
From https://github.com/jacob-carlborg/dmd
 * branch            serializer-basic-types -> 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 4013 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/root/outbuffer.d deleted in HEAD and modified in 067e9567d2239e5abbfc95ea864e6525b3f156ad. Version 067e9567d2239e5abbfc95ea864e6525b3f156ad of src/dmd/root/outbuffer.d left in tree.
CONFLICT (modify/delete): src/dmd/root/longdouble.d deleted in HEAD and modified in 067e9567d2239e5abbfc95ea864e6525b3f156ad. Version 067e9567d2239e5abbfc95ea864e6525b3f156ad of src/dmd/root/longdouble.d left in tree.
CONFLICT (modify/delete): src/dmd/root/ctfloat.d deleted in HEAD and modified in 067e9567d2239e5abbfc95ea864e6525b3f156ad. Version 067e9567d2239e5abbfc95ea864e6525b3f156ad of src/dmd/root/ctfloat.d left in tree.
Automatic merge failed; fix conflicts and then commit the result.