fetching https://github.com/thewilsonator/dmd.git rosetta (attempt: 1/3) From https://github.com/thewilsonator/dmd * branch rosetta -> 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 4083 and retry the command. CONFLICT (modify/delete): src/dmd/root/strtold.d deleted in HEAD and modified in df16e356e3cdbf223a96d6969fa923fa4c1d8e86. Version df16e356e3cdbf223a96d6969fa923fa4c1d8e86 of src/dmd/root/strtold.d left in tree. CONFLICT (modify/delete): src/dmd/root/longdouble.d deleted in HEAD and modified in df16e356e3cdbf223a96d6969fa923fa4c1d8e86. Version df16e356e3cdbf223a96d6969fa923fa4c1d8e86 of src/dmd/root/longdouble.d left in tree. CONFLICT (modify/delete): src/dmd/root/ctfloat.d deleted in HEAD and modified in df16e356e3cdbf223a96d6969fa923fa4c1d8e86. Version df16e356e3cdbf223a96d6969fa923fa4c1d8e86 of src/dmd/root/ctfloat.d left in tree. CONFLICT (modify/delete): src/dmd/backend/os.d deleted in HEAD and modified in df16e356e3cdbf223a96d6969fa923fa4c1d8e86. Version df16e356e3cdbf223a96d6969fa923fa4c1d8e86 of src/dmd/backend/os.d left in tree. CONFLICT (modify/delete): src/dmd/backend/evalu8.d deleted in HEAD and modified in df16e356e3cdbf223a96d6969fa923fa4c1d8e86. Version df16e356e3cdbf223a96d6969fa923fa4c1d8e86 of src/dmd/backend/evalu8.d left in tree. CONFLICT (modify/delete): src/dmd/backend/elem.d deleted in HEAD and modified in df16e356e3cdbf223a96d6969fa923fa4c1d8e86. Version df16e356e3cdbf223a96d6969fa923fa4c1d8e86 of src/dmd/backend/elem.d left in tree. CONFLICT (modify/delete): src/dmd/backend/bcomplex.d deleted in HEAD and modified in df16e356e3cdbf223a96d6969fa923fa4c1d8e86. Version df16e356e3cdbf223a96d6969fa923fa4c1d8e86 of src/dmd/backend/bcomplex.d left in tree. CONFLICT (modify/delete): src/build.d deleted in HEAD and modified in df16e356e3cdbf223a96d6969fa923fa4c1d8e86. Version df16e356e3cdbf223a96d6969fa923fa4c1d8e86 of src/build.d left in tree. Automatic merge failed; fix conflicts and then commit the result.