(for PR #25889)
2025-05-23 20:35.26: New job: Analyse
2025-05-23 20:35.26: Waiting for resource in pool analyse
2025-05-23 20:37.17: Got resource from pool analyse
2025-05-23 20:37.17: Checking out commit 93450bab. To reproduce:
git clone --recursive "https://github.com/ocaml/opam-repository.git" && cd "opam-repository" && git fetch origin "refs/pull/25889/head" && git reset --hard 93450bab
2025-05-23 20:37.17: Exec: "cp" "-a" "--" "/var/lib/ocurrent/var/git/opam-repository.git-a0bc4b41ddb868605dc1500002c27cfa79faf4389fe53b6754817ea16b48d458/.git"
"/tmp/git-checkout254fff85"
2025-05-23 20:37.18: Exec: "git" "-C" "/tmp/git-checkout254fff85" "submodule"
"deinit" "--force" "--all"
2025-05-23 20:37.19: Exec: "git" "-C" "/tmp/git-checkout254fff85" "reset"
"--hard" "-q" "93450bab6f4ccfda0b50177b39c9218bc8e47470"
2025-05-23 20:37.24: Exec: "git" "-c" "protocol.file.allow=always" "-C"
"/tmp/git-checkout254fff85" "submodule" "update"
"--recursive" "--init" "--no-fetch"
2025-05-23 20:37.24: Exec: "git" "merge" "-q" "--" "428327733193cda496cf0f6a6e47f2172aab591e"
Auto-merging packages/conf-libclang/conf-libclang.10/opam
CONFLICT (content): Merge conflict in packages/conf-libclang/conf-libclang.10/opam
Auto-merging packages/conf-libclang/conf-libclang.11/opam
CONFLICT (content): Merge conflict in packages/conf-libclang/conf-libclang.11/opam
Auto-merging packages/conf-libclang/conf-libclang.12/opam
CONFLICT (content): Merge conflict in packages/conf-libclang/conf-libclang.12/opam
Auto-merging packages/conf-libclang/conf-libclang.13/opam
CONFLICT (content): Merge conflict in packages/conf-libclang/conf-libclang.13/opam
Auto-merging packages/conf-libclang/conf-libclang.14/opam
CONFLICT (content): Merge conflict in packages/conf-libclang/conf-libclang.14/opam
Auto-merging packages/conf-libclang/conf-libclang.15/opam
CONFLICT (content): Merge conflict in packages/conf-libclang/conf-libclang.15/opam
Automatic merge failed; fix conflicts and then commit the result.
2025-05-23 20:37.28: Merge failed: Command "git" "merge" "-q" "--" "428327733193cda496cf0f6a6e47f2172aab591e" exited with status 1
2025-05-23 20:37.47: Job failed: Cannot merge to master - please rebase!