Build:
  1. 15
  2. 14
  3. 13
  4. 12
  5. 11
  6. 10
  7. 9
  8. 8
  9. 7
  10. 6
2025-01-21 23:16.50: New job: Analyse
2025-01-21 23:16.50: Waiting for resource in pool analyse
2025-01-21 23:18.21: Got resource from pool analyse
2025-01-21 23:18.21: Checking out commit cc8f1133. To reproduce:
                       git clone --recursive "https://github.com/ocaml/opam-repository.git" && cd "opam-repository" && git fetch origin "refs/pull/27273/head" && git reset --hard cc8f1133
2025-01-21 23:18.21: Exec: "cp" "-a" "--" "/var/lib/ocurrent/var/git/opam-repository.git-a0bc4b41ddb868605dc1500002c27cfa79faf4389fe53b6754817ea16b48d458/.git" 
                           "/tmp/git-checkout86aa6f4"
2025-01-21 23:18.24: Exec: "git" "-C" "/tmp/git-checkout86aa6f4" "submodule" 
                           "deinit" "--force" "--all"
2025-01-21 23:18.25: Exec: "git" "-C" "/tmp/git-checkout86aa6f4" "reset" 
                           "--hard" "-q" "cc8f1133131ad67db64db5fcd7b7dfd290ddbe9e"
2025-01-21 23:18.32: Exec: "git" "-c" "protocol.file.allow=always" "-C" 
                           "/tmp/git-checkout86aa6f4" "submodule" "update" 
                           "--recursive" "--init" "--no-fetch"
2025-01-21 23:18.33: Exec: "git" "merge" "-q" "--" "bc599cf181a21650667f6db436d95491e7989d2a"
CONFLICT (modify/delete): packages/agrep/agrep.1.0/opam deleted in HEAD and modified in bc599cf181a21650667f6db436d95491e7989d2a.  Version bc599cf181a21650667f6db436d95491e7989d2a of packages/agrep/agrep.1.0/opam left in tree.
CONFLICT (modify/delete): packages/jitsu/jitsu.0.3.0/opam deleted in HEAD and modified in bc599cf181a21650667f6db436d95491e7989d2a.  Version bc599cf181a21650667f6db436d95491e7989d2a of packages/jitsu/jitsu.0.3.0/opam left in tree.
CONFLICT (modify/delete): packages/mirage-entropy-unix/mirage-entropy-unix.0.2.0/opam deleted in HEAD and modified in bc599cf181a21650667f6db436d95491e7989d2a.  Version bc599cf181a21650667f6db436d95491e7989d2a of packages/mirage-entropy-unix/mirage-entropy-unix.0.2.0/opam left in tree.
CONFLICT (modify/delete): packages/mirage-entropy-xen/mirage-entropy-xen.0.1.6/opam deleted in HEAD and modified in bc599cf181a21650667f6db436d95491e7989d2a.  Version bc599cf181a21650667f6db436d95491e7989d2a of packages/mirage-entropy-xen/mirage-entropy-xen.0.1.6/opam left in tree.
CONFLICT (modify/delete): packages/mirage-net-direct/mirage-net-direct.0.9.4/opam deleted in HEAD and modified in bc599cf181a21650667f6db436d95491e7989d2a.  Version bc599cf181a21650667f6db436d95491e7989d2a of packages/mirage-net-direct/mirage-net-direct.0.9.4/opam left in tree.
CONFLICT (modify/delete): packages/mirage-net-socket/mirage-net-socket.0.9.4/opam deleted in HEAD and modified in bc599cf181a21650667f6db436d95491e7989d2a.  Version bc599cf181a21650667f6db436d95491e7989d2a of packages/mirage-net-socket/mirage-net-socket.0.9.4/opam left in tree.
Auto-merging packages/ocaml/ocaml.4.02.4/opam
CONFLICT (content): Merge conflict in packages/ocaml/ocaml.4.02.4/opam
Auto-merging packages/ocaml/ocaml.4.03.1/opam
CONFLICT (content): Merge conflict in packages/ocaml/ocaml.4.03.1/opam
Auto-merging packages/ocaml/ocaml.4.04.3/opam
CONFLICT (content): Merge conflict in packages/ocaml/ocaml.4.04.3/opam
Auto-merging packages/ocaml/ocaml.4.05.1/opam
CONFLICT (content): Merge conflict in packages/ocaml/ocaml.4.05.1/opam
Auto-merging packages/ocaml/ocaml.4.06.2/opam
CONFLICT (content): Merge conflict in packages/ocaml/ocaml.4.06.2/opam
Auto-merging packages/ocaml/ocaml.4.07.2/opam
CONFLICT (content): Merge conflict in packages/ocaml/ocaml.4.07.2/opam
CONFLICT (modify/delete): packages/tar-format/tar-format.0.7.1/opam deleted in HEAD and modified in bc599cf181a21650667f6db436d95491e7989d2a.  Version bc599cf181a21650667f6db436d95491e7989d2a of packages/tar-format/tar-format.0.7.1/opam left in tree.
CONFLICT (modify/delete): packages/xenbigarray/xenbigarray.1.0.0/opam deleted in HEAD and modified in bc599cf181a21650667f6db436d95491e7989d2a.  Version bc599cf181a21650667f6db436d95491e7989d2a of packages/xenbigarray/xenbigarray.1.0.0/opam left in tree.
CONFLICT (modify/delete): packages/xentropyd/xentropyd.0.9.3/opam deleted in HEAD and modified in bc599cf181a21650667f6db436d95491e7989d2a.  Version bc599cf181a21650667f6db436d95491e7989d2a of packages/xentropyd/xentropyd.0.9.3/opam left in tree.
Automatic merge failed; fix conflicts and then commit the result.
2025-01-21 23:18.34: Merge failed: Command "git" "merge" "-q" "--" "bc599cf181a21650667f6db436d95491e7989d2a" exited with status 1
2025-01-21 23:19.01: Job failed: Cannot merge to master - please rebase!