(for PR #28856)
2026-02-10 21:11.23: New job: Analyse
2026-02-10 21:11.23: Waiting for resource in pool analyse
2026-02-10 21:15.21: Got resource from pool analyse
2026-02-10 21:15.21: Checking out commit 2ced00a9. To reproduce:
git clone --recursive "https://github.com/ocaml/opam-repository.git" && cd "opam-repository" && git fetch origin "refs/pull/28856/head" && git reset --hard 2ced00a9
2026-02-10 21:15.21: Exec: "cp" "-a" "--" "/var/lib/ocurrent/var/git/opam-repository.git-a0bc4b41ddb868605dc1500002c27cfa79faf4389fe53b6754817ea16b48d458/.git"
"/tmp/git-checkout226d07b0"
2026-02-10 21:15.22: Exec: "git" "-C" "/tmp/git-checkout226d07b0" "submodule"
"deinit" "--force" "--all"
2026-02-10 21:15.23: Exec: "git" "-C" "/tmp/git-checkout226d07b0" "reset"
"--hard" "-q" "2ced00a9546735a5c80b43af9f8a8b815fc37cae"
2026-02-10 21:15.26: Exec: "git" "-c" "protocol.file.allow=always" "-C"
"/tmp/git-checkout226d07b0" "submodule" "update"
"--recursive" "--init" "--no-fetch"
2026-02-10 21:15.27: Exec: "git" "merge" "-q" "--" "98d5860f2a88bcf813cb6816f5afb924cab026a0"
Auto-merging .github/workflows/windows.yml
CONFLICT (content): Merge conflict in .github/workflows/windows.yml
Auto-merging packages/conf-aarch64-linux-gnu-gcc/conf-aarch64-linux-gnu-gcc.1/opam
CONFLICT (content): Merge conflict in packages/conf-aarch64-linux-gnu-gcc/conf-aarch64-linux-gnu-gcc.1/opam
Automatic merge failed; fix conflicts and then commit the result.
2026-02-10 21:15.28: Merge failed: Command "git" "merge" "-q" "--" "98d5860f2a88bcf813cb6816f5afb924cab026a0" exited with status 1
2026-02-10 21:15.45: Job failed: Cannot merge to master - please rebase!