2026-01-30 15:22.49: New job: Analyse
2026-01-30 15:22.49: Waiting for resource in pool analyse
2026-01-30 15:23.31: Got resource from pool analyse
2026-01-30 15:23.31: Checking out commit f8bfc85d. To reproduce:
git clone --recursive "https://github.com/ocaml/opam-repository.git" && cd "opam-repository" && git fetch origin "refs/pull/29058/head" && git reset --hard f8bfc85d
2026-01-30 15:23.31: Exec: "cp" "-a" "--" "/var/lib/ocurrent/var/git/opam-repository.git-a0bc4b41ddb868605dc1500002c27cfa79faf4389fe53b6754817ea16b48d458/.git"
"/tmp/git-checkout3cb22816"
2026-01-30 15:23.33: Exec: "git" "-C" "/tmp/git-checkout3cb22816" "submodule"
"deinit" "--force" "--all"
2026-01-30 15:23.33: Exec: "git" "-C" "/tmp/git-checkout3cb22816" "reset"
"--hard" "-q" "f8bfc85d190b528b53ce2f92fbcfe1c6b61f7ab1"
2026-01-30 15:23.37: Exec: "git" "-c" "protocol.file.allow=always" "-C"
"/tmp/git-checkout3cb22816" "submodule" "update"
"--recursive" "--init" "--no-fetch"
2026-01-30 15:23.38: Exec: "git" "merge" "-q" "--" "f9d2a37222838b325e3d749d5128c928c0059d8f"
CONFLICT (modify/delete): packages/catala-format/catala-format.1.0.0~beta/opam deleted in HEAD and modified in f9d2a37222838b325e3d749d5128c928c0059d8f. Version f9d2a37222838b325e3d749d5128c928c0059d8f of packages/catala-format/catala-format.1.0.0~beta/opam left in tree.
CONFLICT (modify/delete): packages/catala/catala.1.0.0~alpha/opam deleted in HEAD and modified in f9d2a37222838b325e3d749d5128c928c0059d8f. Version f9d2a37222838b325e3d749d5128c928c0059d8f of packages/catala/catala.1.0.0~alpha/opam left in tree.
CONFLICT (modify/delete): packages/catala/catala.1.0.0~beta/opam deleted in HEAD and modified in f9d2a37222838b325e3d749d5128c928c0059d8f. Version f9d2a37222838b325e3d749d5128c928c0059d8f of packages/catala/catala.1.0.0~beta/opam left in tree.
CONFLICT (modify/delete): packages/gapi-ocaml/gapi-ocaml.0.4.6/opam deleted in HEAD and modified in f9d2a37222838b325e3d749d5128c928c0059d8f. Version f9d2a37222838b325e3d749d5128c928c0059d8f of packages/gapi-ocaml/gapi-ocaml.0.4.6/opam left in tree.
CONFLICT (modify/delete): packages/github-unix/github-unix.3.1.0/opam deleted in HEAD and modified in f9d2a37222838b325e3d749d5128c928c0059d8f. Version f9d2a37222838b325e3d749d5128c928c0059d8f of packages/github-unix/github-unix.3.1.0/opam left in tree.
CONFLICT (modify/delete): packages/github-unix/github-unix.4.1.0/opam deleted in HEAD and modified in f9d2a37222838b325e3d749d5128c928c0059d8f. Version f9d2a37222838b325e3d749d5128c928c0059d8f of packages/github-unix/github-unix.4.1.0/opam left in tree.
CONFLICT (modify/delete): packages/github-unix/github-unix.4.3.0/opam deleted in HEAD and modified in f9d2a37222838b325e3d749d5128c928c0059d8f. Version f9d2a37222838b325e3d749d5128c928c0059d8f of packages/github-unix/github-unix.4.3.0/opam left in tree.
CONFLICT (modify/delete): packages/github-unix/github-unix.4.3.1/opam deleted in HEAD and modified in f9d2a37222838b325e3d749d5128c928c0059d8f. Version f9d2a37222838b325e3d749d5128c928c0059d8f of packages/github-unix/github-unix.4.3.1/opam left in tree.
CONFLICT (modify/delete): packages/github-unix/github-unix.4.4.0/opam deleted in HEAD and modified in f9d2a37222838b325e3d749d5128c928c0059d8f. Version f9d2a37222838b325e3d749d5128c928c0059d8f of packages/github-unix/github-unix.4.4.0/opam left in tree.
CONFLICT (modify/delete): packages/lwt/lwt.4.2.0/opam deleted in HEAD and modified in f9d2a37222838b325e3d749d5128c928c0059d8f. Version f9d2a37222838b325e3d749d5128c928c0059d8f of packages/lwt/lwt.4.2.0/opam left in tree.
CONFLICT (modify/delete): packages/lwt/lwt.4.2.1/opam deleted in HEAD and modified in f9d2a37222838b325e3d749d5128c928c0059d8f. Version f9d2a37222838b325e3d749d5128c928c0059d8f of packages/lwt/lwt.4.2.1/opam left in tree.
CONFLICT (modify/delete): packages/lwt/lwt.4.3.0/opam deleted in HEAD and modified in f9d2a37222838b325e3d749d5128c928c0059d8f. Version f9d2a37222838b325e3d749d5128c928c0059d8f of packages/lwt/lwt.4.3.0/opam left in tree.
CONFLICT (modify/delete): packages/lwt/lwt.4.3.1/opam deleted in HEAD and modified in f9d2a37222838b325e3d749d5128c928c0059d8f. Version f9d2a37222838b325e3d749d5128c928c0059d8f of packages/lwt/lwt.4.3.1/opam left in tree.
CONFLICT (modify/delete): packages/lwt/lwt.4.4.0/opam deleted in HEAD and modified in f9d2a37222838b325e3d749d5128c928c0059d8f. Version f9d2a37222838b325e3d749d5128c928c0059d8f of packages/lwt/lwt.4.4.0/opam left in tree.
CONFLICT (modify/delete): packages/lwt/lwt.5.0.1/opam deleted in HEAD and modified in f9d2a37222838b325e3d749d5128c928c0059d8f. Version f9d2a37222838b325e3d749d5128c928c0059d8f of packages/lwt/lwt.5.0.1/opam left in tree.
CONFLICT (modify/delete): packages/lwt/lwt.5.1.0/opam deleted in HEAD and modified in f9d2a37222838b325e3d749d5128c928c0059d8f. Version f9d2a37222838b325e3d749d5128c928c0059d8f of packages/lwt/lwt.5.1.0/opam left in tree.
CONFLICT (modify/delete): packages/lwt/lwt.5.1.2/opam deleted in HEAD and modified in f9d2a37222838b325e3d749d5128c928c0059d8f. Version f9d2a37222838b325e3d749d5128c928c0059d8f of packages/lwt/lwt.5.1.2/opam left in tree.
CONFLICT (modify/delete): packages/lwt/lwt.5.2.0/opam deleted in HEAD and modified in f9d2a37222838b325e3d749d5128c928c0059d8f. Version f9d2a37222838b325e3d749d5128c928c0059d8f of packages/lwt/lwt.5.2.0/opam left in tree.
CONFLICT (modify/delete): packages/lwt/lwt.5.3.0/opam deleted in HEAD and modified in f9d2a37222838b325e3d749d5128c928c0059d8f. Version f9d2a37222838b325e3d749d5128c928c0059d8f of packages/lwt/lwt.5.3.0/opam left in tree.
CONFLICT (modify/delete): packages/lwt/lwt.5.4.0/opam deleted in HEAD and modified in f9d2a37222838b325e3d749d5128c928c0059d8f. Version f9d2a37222838b325e3d749d5128c928c0059d8f of packages/lwt/lwt.5.4.0/opam left in tree.
CONFLICT (modify/delete): packages/lwt/lwt.5.4.1/opam deleted in HEAD and modified in f9d2a37222838b325e3d749d5128c928c0059d8f. Version f9d2a37222838b325e3d749d5128c928c0059d8f of packages/lwt/lwt.5.4.1/opam left in tree.
CONFLICT (modify/delete): packages/lwt/lwt.5.4.2/opam deleted in HEAD and modified in f9d2a37222838b325e3d749d5128c928c0059d8f. Version f9d2a37222838b325e3d749d5128c928c0059d8f of packages/lwt/lwt.5.4.2/opam left in tree.
CONFLICT (modify/delete): packages/lwt/lwt.5.6.0/opam deleted in HEAD and modified in f9d2a37222838b325e3d749d5128c928c0059d8f. Version f9d2a37222838b325e3d749d5128c928c0059d8f of packages/lwt/lwt.5.6.0/opam left in tree.
CONFLICT (modify/delete): packages/lwt/lwt.5.8.0/opam deleted in HEAD and modified in f9d2a37222838b325e3d749d5128c928c0059d8f. Version f9d2a37222838b325e3d749d5128c928c0059d8f of packages/lwt/lwt.5.8.0/opam left in tree.
CONFLICT (modify/delete): packages/lwt/lwt.5.8.1/opam deleted in HEAD and modified in f9d2a37222838b325e3d749d5128c928c0059d8f. Version f9d2a37222838b325e3d749d5128c928c0059d8f of packages/lwt/lwt.5.8.1/opam left in tree.
CONFLICT (modify/delete): packages/lwt/lwt.5.9.0/opam deleted in HEAD and modified in f9d2a37222838b325e3d749d5128c928c0059d8f. Version f9d2a37222838b325e3d749d5128c928c0059d8f of packages/lwt/lwt.5.9.0/opam left in tree.
CONFLICT (modify/delete): packages/mirage-runtime/mirage-runtime.4.10.0/opam deleted in HEAD and modified in f9d2a37222838b325e3d749d5128c928c0059d8f. Version f9d2a37222838b325e3d749d5128c928c0059d8f of packages/mirage-runtime/mirage-runtime.4.10.0/opam left in tree.
CONFLICT (modify/delete): packages/mirage-runtime/mirage-runtime.4.10.1/opam deleted in HEAD and modified in f9d2a37222838b325e3d749d5128c928c0059d8f. Version f9d2a37222838b325e3d749d5128c928c0059d8f of packages/mirage-runtime/mirage-runtime.4.10.1/opam left in tree.
CONFLICT (modify/delete): packages/mirage-runtime/mirage-runtime.4.10.2/opam deleted in HEAD and modified in f9d2a37222838b325e3d749d5128c928c0059d8f. Version f9d2a37222838b325e3d749d5128c928c0059d8f of packages/mirage-runtime/mirage-runtime.4.10.2/opam left in tree.
CONFLICT (modify/delete): packages/mirage-runtime/mirage-runtime.4.10.3/opam deleted in HEAD and modified in f9d2a37222838b325e3d749d5128c928c0059d8f. Version f9d2a37222838b325e3d749d5128c928c0059d8f of packages/mirage-runtime/mirage-runtime.4.10.3/opam left in tree.
CONFLICT (modify/delete): packages/mirage-runtime/mirage-runtime.4.9.0/opam deleted in HEAD and modified in f9d2a37222838b325e3d749d5128c928c0059d8f. Version f9d2a37222838b325e3d749d5128c928c0059d8f of packages/mirage-runtime/mirage-runtime.4.9.0/opam left in tree.
CONFLICT (modify/delete): packages/ocaml-base-compiler/ocaml-base-compiler.5.2.1~rc1/opam deleted in HEAD and modified in f9d2a37222838b325e3d749d5128c928c0059d8f. Version f9d2a37222838b325e3d749d5128c928c0059d8f of packages/ocaml-base-compiler/ocaml-base-compiler.5.2.1~rc1/opam left in tree.
CONFLICT (modify/delete): packages/tezt/tezt.2.0.0/opam deleted in HEAD and modified in f9d2a37222838b325e3d749d5128c928c0059d8f. Version f9d2a37222838b325e3d749d5128c928c0059d8f of packages/tezt/tezt.2.0.0/opam left in tree.
CONFLICT (modify/delete): packages/tezt/tezt.3.0.0/opam deleted in HEAD and modified in f9d2a37222838b325e3d749d5128c928c0059d8f. Version f9d2a37222838b325e3d749d5128c928c0059d8f of packages/tezt/tezt.3.0.0/opam left in tree.
Automatic merge failed; fix conflicts and then commit the result.
2026-01-30 15:23.39: Merge failed: Command "git" "merge" "-q" "--" "f9d2a37222838b325e3d749d5128c928c0059d8f" exited with status 1
2026-01-30 15:23.51: Job failed: Cannot merge to master - please rebase!