(for PR #25889)
2026-05-06 19:44.26: New job: Analyse
2026-05-06 19:44.26: Waiting for resource in pool analyse
2026-05-06 19:48.44: Got resource from pool analyse
2026-05-06 19:48.44: 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
2026-05-06 19:48.44: Exec: "cp" "-a" "--" "/var/lib/ocurrent/var/git/opam-repository.git-a0bc4b41ddb868605dc1500002c27cfa79faf4389fe53b6754817ea16b48d458/.git"
"/tmp/git-checkout1c596187"
2026-05-06 19:48.46: Exec: "git" "-C" "/tmp/git-checkout1c596187" "submodule"
"deinit" "--force" "--all"
2026-05-06 19:48.47: Exec: "git" "-C" "/tmp/git-checkout1c596187" "reset"
"--hard" "-q" "93450bab6f4ccfda0b50177b39c9218bc8e47470"
2026-05-06 19:48.53: Exec: "git" "-c" "protocol.file.allow=always" "-C"
"/tmp/git-checkout1c596187" "submodule" "update"
"--recursive" "--init" "--no-fetch"
2026-05-06 19:48.54: Exec: "git" "merge" "-q" "--" "653554dcc09c619c108112fc63f211886ba7fc5f"
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.
2026-05-06 19:48.58: Merge failed: Command "git" "merge" "-q" "--" "653554dcc09c619c108112fc63f211886ba7fc5f" exited with status 1
2026-05-06 19:49.43: Job failed: Cannot merge to master - please rebase!