(for PR #29058)
2025-12-31 08:21.58: New job: Analyse
2025-12-31 08:21.58: Waiting for resource in pool analyse
2025-12-31 08:24.09: Got resource from pool analyse
2025-12-31 08:24.09: 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
2025-12-31 08:24.09: Exec: "cp" "-a" "--" "/var/lib/ocurrent/var/git/opam-repository.git-a0bc4b41ddb868605dc1500002c27cfa79faf4389fe53b6754817ea16b48d458/.git"
"/tmp/git-checkout2b92d587"
2025-12-31 08:24.10: Exec: "git" "-C" "/tmp/git-checkout2b92d587" "submodule"
"deinit" "--force" "--all"
2025-12-31 08:24.11: Exec: "git" "-C" "/tmp/git-checkout2b92d587" "reset"
"--hard" "-q" "f8bfc85d190b528b53ce2f92fbcfe1c6b61f7ab1"
2025-12-31 08:24.14: Exec: "git" "-c" "protocol.file.allow=always" "-C"
"/tmp/git-checkout2b92d587" "submodule" "update"
"--recursive" "--init" "--no-fetch"
2025-12-31 08:24.15: Exec: "git" "merge" "-q" "--" "56368dd1acf4bf68f49ac2bdd09e360e687d4741"
CONFLICT (modify/delete): packages/github-unix/github-unix.3.1.0/opam deleted in HEAD and modified in 56368dd1acf4bf68f49ac2bdd09e360e687d4741. Version 56368dd1acf4bf68f49ac2bdd09e360e687d4741 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 56368dd1acf4bf68f49ac2bdd09e360e687d4741. Version 56368dd1acf4bf68f49ac2bdd09e360e687d4741 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 56368dd1acf4bf68f49ac2bdd09e360e687d4741. Version 56368dd1acf4bf68f49ac2bdd09e360e687d4741 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 56368dd1acf4bf68f49ac2bdd09e360e687d4741. Version 56368dd1acf4bf68f49ac2bdd09e360e687d4741 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 56368dd1acf4bf68f49ac2bdd09e360e687d4741. Version 56368dd1acf4bf68f49ac2bdd09e360e687d4741 of packages/github-unix/github-unix.4.4.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 56368dd1acf4bf68f49ac2bdd09e360e687d4741. Version 56368dd1acf4bf68f49ac2bdd09e360e687d4741 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 56368dd1acf4bf68f49ac2bdd09e360e687d4741. Version 56368dd1acf4bf68f49ac2bdd09e360e687d4741 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 56368dd1acf4bf68f49ac2bdd09e360e687d4741. Version 56368dd1acf4bf68f49ac2bdd09e360e687d4741 of packages/tezt/tezt.3.0.0/opam left in tree.
Automatic merge failed; fix conflicts and then commit the result.
2025-12-31 08:24.16: Merge failed: Command "git" "merge" "-q" "--" "56368dd1acf4bf68f49ac2bdd09e360e687d4741" exited with status 1
2025-12-31 08:24.32: Job failed: Cannot merge to master - please rebase!