fetching https://github.com/ljmf00/dmd.git bump-cirrus-ci (attempt: 1/3)
From https://github.com/ljmf00/dmd
 * branch            bump-cirrus-ci -> 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 4105 and retry the command.
CONFLICT (modify/delete): test/runnable/extra-files/hello-profile-postscript.sh deleted in HEAD and modified in af91b4cd31aa31e931c437d78fed244fc9b6543d. Version af91b4cd31aa31e931c437d78fed244fc9b6543d of test/runnable/extra-files/hello-profile-postscript.sh left in tree.
CONFLICT (modify/delete): test/runnable/extra-files/coverage-postscript.sh deleted in HEAD and modified in af91b4cd31aa31e931c437d78fed244fc9b6543d. Version af91b4cd31aa31e931c437d78fed244fc9b6543d of test/runnable/extra-files/coverage-postscript.sh left in tree.
CONFLICT (modify/delete): test/compilable/extra-files/objdump-postscript.sh deleted in HEAD and modified in af91b4cd31aa31e931c437d78fed244fc9b6543d. Version af91b4cd31aa31e931c437d78fed244fc9b6543d of test/compilable/extra-files/objdump-postscript.sh left in tree.
CONFLICT (modify/delete): test/compilable/extra-files/json-postscript.sh deleted in HEAD and modified in af91b4cd31aa31e931c437d78fed244fc9b6543d. Version af91b4cd31aa31e931c437d78fed244fc9b6543d of test/compilable/extra-files/json-postscript.sh left in tree.
CONFLICT (modify/delete): test/compilable/extra-files/ddocYear-postscript.sh deleted in HEAD and modified in af91b4cd31aa31e931c437d78fed244fc9b6543d. Version af91b4cd31aa31e931c437d78fed244fc9b6543d of test/compilable/extra-files/ddocYear-postscript.sh left in tree.
CONFLICT (modify/delete): test/compilable/extra-files/ddocAny-postscript.sh deleted in HEAD and modified in af91b4cd31aa31e931c437d78fed244fc9b6543d. Version af91b4cd31aa31e931c437d78fed244fc9b6543d of test/compilable/extra-files/ddocAny-postscript.sh left in tree.
CONFLICT (modify/delete): cirrusci.sh deleted in HEAD and modified in af91b4cd31aa31e931c437d78fed244fc9b6543d. Version af91b4cd31aa31e931c437d78fed244fc9b6543d of cirrusci.sh left in tree.
Auto-merging .cirrus.yml
CONFLICT (content): Merge conflict in .cirrus.yml
Automatic merge failed; fix conflicts and then commit the result.