Showing logs for build greencapitaltrade/deadpool/pr-33 #2 stage from-build-pack and container prepare
2026/05/20 11:51:33 Entrypoint initialization

Showing logs for build greencapitaltrade/deadpool/pr-33 #2 stage from-build-pack and container place-scripts
2026/05/20 11:52:17 Decoded script /tekton/scripts/script-0-lttf5
2026/05/20 11:52:18 Decoded script /tekton/scripts/script-1-9ng58
2026/05/20 11:52:18 Decoded script /tekton/scripts/script-2-h849w
2026/05/20 11:52:18 Decoded script /tekton/scripts/script-3-gz7cs
2026/05/20 11:52:18 Decoded script /tekton/scripts/script-4-xgdlw
2026/05/20 11:52:18 Decoded script /tekton/scripts/script-6-bbnq9
2026/05/20 11:52:18 Decoded script /tekton/scripts/script-7-x44k2
2026/05/20 11:52:18 Decoded script /tekton/scripts/script-8-rlqdz
2026/05/20 11:52:18 Decoded script /tekton/scripts/script-9-nrnd2

Showing logs for build greencapitaltrade/deadpool/pr-33 #2 stage from-build-pack and container working-dir-initializer

Showing logs for build greencapitaltrade/deadpool/pr-33 #2 stage from-build-pack and container step-git-clone
git cloning url: https://github.com/greencapitaltrade/deadpool.git version refs/pull/33/head:PR-33@287f6e348aa3ab59dfa95f2cc2fb399370c6de22 to dir: source
Cloning into 'source'...
From https://github.com/greencapitaltrade/deadpool
 * [new ref]         refs/pull/33/head -> PR-33
Switched to branch 'PR-33'
HEAD is now at 287f6e3 refactor: drop legacy 0x50 dual-path now that firmware speaks only 0x10
checked out revision: refs/pull/33/head:PR-33@287f6e348aa3ab59dfa95f2cc2fb399370c6de22 to dir: source

Showing logs for build greencapitaltrade/deadpool/pr-33 #2 stage from-build-pack and container step-git-merge
setup git user  email jenkins-x@googlegroups.com
Using SHAs from PULL_REFS=main:41cad51af42737744884c2800d42b5d907b06044,33:287f6e348aa3ab59dfa95f2cc2fb399370c6de22:refs/pull/33/head
using base branch main and base sha 41cad51af42737744884c2800d42b5d907b06044
merging sha: 287f6e348aa3ab59dfa95f2cc2fb399370c6de22
error: error during merge: merging 287f6e348aa3ab59dfa95f2cc2fb399370c6de22 into main: failed to run 'git merge 287f6e348aa3ab59dfa95f2cc2fb399370c6de22' command in directory '.', output: 'Auto-merging services/iot-common/src/bifrost.rs
CONFLICT (modify/delete): services/iot-common/src/command_signer.rs deleted in 287f6e348aa3ab59dfa95f2cc2fb399370c6de22 and modified in HEAD.  Version HEAD of services/iot-common/src/command_signer.rs left in tree.
Auto-merging services/iot-common/src/protocols/terra.rs
CONFLICT (content): Merge conflict in services/iot-common/src/protocols/terra.rs
Auto-merging services/iot-consumer/src/protocols/mod.rs
CONFLICT (content): Merge conflict in services/iot-consumer/src/protocols/mod.rs
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.