(for PR #29058)
2026-01-21 21:57.54: New job: Analyse
2026-01-21 21:57.54: Waiting for resource in pool analyse
2026-01-21 22:01.13: Got resource from pool analyse
2026-01-21 22:01.13: 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-21 22:01.13: Exec: "cp" "-a" "--" "/var/lib/ocurrent/var/git/opam-repository.git-a0bc4b41ddb868605dc1500002c27cfa79faf4389fe53b6754817ea16b48d458/.git"
"/tmp/git-checkout3f9fe8fa"
2026-01-21 22:01.14: Exec: "git" "-C" "/tmp/git-checkout3f9fe8fa" "submodule"
"deinit" "--force" "--all"
2026-01-21 22:01.15: Exec: "git" "-C" "/tmp/git-checkout3f9fe8fa" "reset"
"--hard" "-q" "f8bfc85d190b528b53ce2f92fbcfe1c6b61f7ab1"
2026-01-21 22:01.18: Exec: "git" "-c" "protocol.file.allow=always" "-C"
"/tmp/git-checkout3f9fe8fa" "submodule" "update"
"--recursive" "--init" "--no-fetch"
2026-01-21 22:01.18: Exec: "git" "merge" "-q" "--" "5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f"
CONFLICT (modify/delete): packages/gapi-ocaml/gapi-ocaml.0.4.6/opam deleted in HEAD and modified in 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f. Version 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f 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 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f. Version 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f 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 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f. Version 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f 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 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f. Version 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f 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 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f. Version 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f 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 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f. Version 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f 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 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f. Version 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f 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 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f. Version 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f 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 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f. Version 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f 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 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f. Version 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f 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 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f. Version 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f 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 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f. Version 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f 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 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f. Version 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f 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 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f. Version 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f 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 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f. Version 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f 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 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f. Version 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f 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 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f. Version 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f 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 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f. Version 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f 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 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f. Version 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f 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 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f. Version 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f 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 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f. Version 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f 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 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f. Version 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f 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 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f. Version 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f 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 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f. Version 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f 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 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f. Version 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f 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 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f. Version 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f 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 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f. Version 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f 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 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f. Version 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f 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 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f. Version 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f 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 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f. Version 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f 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 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f. Version 5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f of packages/tezt/tezt.3.0.0/opam left in tree.
Automatic merge failed; fix conflicts and then commit the result.
2026-01-21 22:01.19: Merge failed: Command "git" "merge" "-q" "--" "5bcf75c1acf9cccbe4dfd7e6c4ad828446384c0f" exited with status 1
2026-01-21 22:01.31: Job failed: Cannot merge to master - please rebase!