Showing logs for build greencapitaltrade/deadpool/pr-28 #14 stage from-build-pack and container prepare 2026/05/14 23:24:32 Entrypoint initialization Showing logs for build greencapitaltrade/deadpool/pr-28 #14 stage from-build-pack and container place-scripts 2026/05/14 23:24:45 Decoded script /tekton/scripts/script-0-kndtf 2026/05/14 23:24:45 Decoded script /tekton/scripts/script-1-wg4zj 2026/05/14 23:24:45 Decoded script /tekton/scripts/script-2-vcdkf 2026/05/14 23:24:45 Decoded script /tekton/scripts/script-3-cgxk4 2026/05/14 23:24:45 Decoded script /tekton/scripts/script-4-25fw6 2026/05/14 23:24:45 Decoded script /tekton/scripts/script-6-dwf99 2026/05/14 23:24:45 Decoded script /tekton/scripts/script-7-tmwnv 2026/05/14 23:24:45 Decoded script /tekton/scripts/script-8-v6lp9 2026/05/14 23:24:45 Decoded script /tekton/scripts/script-9-f7kvs Showing logs for build greencapitaltrade/deadpool/pr-28 #14 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/deadpool/pr-28 #14 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/deadpool.git version refs/pull/28/head:PR-28@5e4650081a86251a7236802b504f3ff8b1afd7ec to dir: source Cloning into 'source'... From https://github.com/greencapitaltrade/deadpool * [new ref] refs/pull/28/head -> PR-28 Switched to branch 'PR-28' HEAD is now at 5e46500 retrigger checked out revision: refs/pull/28/head:PR-28@5e4650081a86251a7236802b504f3ff8b1afd7ec to dir: source Showing logs for build greencapitaltrade/deadpool/pr-28 #14 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:60e2ecfe4ca3d2fc7b2767f11f1898f4179a0b5e,28:5e4650081a86251a7236802b504f3ff8b1afd7ec:refs/pull/28/head using base branch main and base sha 60e2ecfe4ca3d2fc7b2767f11f1898f4179a0b5e merging sha: 5e4650081a86251a7236802b504f3ff8b1afd7ec error: error during merge: merging 5e4650081a86251a7236802b504f3ff8b1afd7ec into main: failed to run 'git merge 5e4650081a86251a7236802b504f3ff8b1afd7ec' command in directory '.', output: 'Auto-merging Cargo.toml CONFLICT (content): Merge conflict in Cargo.toml Automatic merge failed; fix conflicts and then commit the result.'  Pipeline failed on stage 'from-build-pack' : container 'step-git-merge'. The execution of the pipeline has stopped.