2026-04-19 07:00.18: New job: Analyse
2026-04-19 07:00.18: Waiting for resource in pool analyse
2026-04-19 07:02.46: Got resource from pool analyse
2026-04-19 07:02.46: 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
2026-04-19 07:02.46: Exec: "cp" "-a" "--" "/var/lib/ocurrent/var/git/opam-repository.git-a0bc4b41ddb868605dc1500002c27cfa79faf4389fe53b6754817ea16b48d458/.git" 
                           "/tmp/git-checkout3d13128c"
2026-04-19 07:02.48: Exec: "git" "-C" "/tmp/git-checkout3d13128c" "submodule" 
                           "deinit" "--force" "--all"
2026-04-19 07:02.48: Exec: "git" "-C" "/tmp/git-checkout3d13128c" "reset" 
                           "--hard" "-q" "7b1e5461573e6892e8115396f172d80b9ef38a62"
2026-04-19 07:02.52: Exec: "git" "-c" "protocol.file.allow=always" "-C" 
                           "/tmp/git-checkout3d13128c" "submodule" "update" 
                           "--recursive" "--init" "--no-fetch"
2026-04-19 07:02.53: Exec: "git" "merge" "-q" "--" "1e0f02e011661beec5618d34d6dda854b00b2358"
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.
2026-04-19 07:02.55: Merge failed: Command "git" "merge" "-q" "--" "1e0f02e011661beec5618d34d6dda854b00b2358" exited with status 1
2026-04-19 07:03.11: Job failed: Cannot merge to master - please rebase!