(for PR #28455)
2025-12-12 22:30.16: New job: Analyse
2025-12-12 22:30.16: Waiting for resource in pool analyse
2025-12-12 22:34.14: Got resource from pool analyse
2025-12-12 22:34.14: Checking out commit 7b1e5461. To reproduce:
git clone --recursive "https://github.com/ocaml/opam-repository.git" && cd "opam-repository" && git fetch origin "refs/pull/28455/head" && git reset --hard 7b1e5461
2025-12-12 22:34.14: Exec: "cp" "-a" "--" "/var/lib/ocurrent/var/git/opam-repository.git-a0bc4b41ddb868605dc1500002c27cfa79faf4389fe53b6754817ea16b48d458/.git"
"/tmp/git-checkout23ee1cbd"
2025-12-12 22:34.16: Exec: "git" "-C" "/tmp/git-checkout23ee1cbd" "submodule"
"deinit" "--force" "--all"
2025-12-12 22:34.17: Exec: "git" "-C" "/tmp/git-checkout23ee1cbd" "reset"
"--hard" "-q" "7b1e5461573e6892e8115396f172d80b9ef38a62"
2025-12-12 22:34.20: Exec: "git" "-c" "protocol.file.allow=always" "-C"
"/tmp/git-checkout23ee1cbd" "submodule" "update"
"--recursive" "--init" "--no-fetch"
2025-12-12 22:34.20: Exec: "git" "merge" "-q" "--" "59307dadd942c7a6126e2a36ffe2e8565939abc9"
Auto-merging packages/ocaml-system/ocaml-system.5.4.0/opam
CONFLICT (add/add): Merge conflict in packages/ocaml-system/ocaml-system.5.4.0/opam
Automatic merge failed; fix conflicts and then commit the result.
2025-12-12 22:34.22: Merge failed: Command "git" "merge" "-q" "--" "59307dadd942c7a6126e2a36ffe2e8565939abc9" exited with status 1
2025-12-12 22:34.40: Job failed: Cannot merge to master - please rebase!