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
Auto-merging compiler/test/runnable/extra-files/hello-profile-postscript.sh
Auto-merging compiler/test/runnable/extra-files/coverage-postscript.sh
Auto-merging compiler/test/compilable/extra-files/objdump-postscript.sh
Auto-merging compiler/test/compilable/extra-files/json-postscript.sh
Auto-merging compiler/test/compilable/extra-files/ddocYear-postscript.sh
Auto-merging compiler/test/compilable/extra-files/ddocAny-postscript.sh
Auto-merging ci/cirrusci.sh
CONFLICT (content): Merge conflict in ci/cirrusci.sh
Auto-merging .cirrus.yml
CONFLICT (content): Merge conflict in .cirrus.yml
Automatic merge failed; fix conflicts and then commit the result.