(for PR #28856)
2025-12-12 22:30.17: New job: Analyse
2025-12-12 22:30.17: Waiting for resource in pool analyse
2025-12-12 22:35.36: Got resource from pool analyse
2025-12-12 22:35.36: 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
2025-12-12 22:35.36: Exec: "cp" "-a" "--" "/var/lib/ocurrent/var/git/opam-repository.git-a0bc4b41ddb868605dc1500002c27cfa79faf4389fe53b6754817ea16b48d458/.git"
"/tmp/git-checkout171fe5a5"
2025-12-12 22:35.38: Exec: "git" "-C" "/tmp/git-checkout171fe5a5" "submodule"
"deinit" "--force" "--all"
2025-12-12 22:35.38: Exec: "git" "-C" "/tmp/git-checkout171fe5a5" "reset"
"--hard" "-q" "2ced00a9546735a5c80b43af9f8a8b815fc37cae"
2025-12-12 22:35.42: Exec: "git" "-c" "protocol.file.allow=always" "-C"
"/tmp/git-checkout171fe5a5" "submodule" "update"
"--recursive" "--init" "--no-fetch"
2025-12-12 22:35.42: Exec: "git" "merge" "-q" "--" "59307dadd942c7a6126e2a36ffe2e8565939abc9"
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.
2025-12-12 22:35.43: Merge failed: Command "git" "merge" "-q" "--" "59307dadd942c7a6126e2a36ffe2e8565939abc9" exited with status 1
2025-12-12 22:36.00: Job failed: Cannot merge to master - please rebase!