Showing logs for build greencapitaltrade/deadpool/pr-150 #3 stage from-build-pack and container prepare
2026/07/29 12:05:45 Entrypoint initialization

Showing logs for build greencapitaltrade/deadpool/pr-150 #3 stage from-build-pack and container place-scripts
2026/07/29 12:05:46 Decoded script /tekton/scripts/script-0-wdbxx
2026/07/29 12:05:46 Decoded script /tekton/scripts/script-1-xh7m2
2026/07/29 12:05:46 Decoded script /tekton/scripts/script-2-5h98b
2026/07/29 12:05:46 Decoded script /tekton/scripts/script-3-mdxsx
2026/07/29 12:05:46 Decoded script /tekton/scripts/script-4-qrmdd
2026/07/29 12:05:46 Decoded script /tekton/scripts/script-6-5f6z7
2026/07/29 12:05:46 Decoded script /tekton/scripts/script-7-vczln
2026/07/29 12:05:46 Decoded script /tekton/scripts/script-8-dxl6w
2026/07/29 12:05:46 Decoded script /tekton/scripts/script-9-4ph46

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

Showing logs for build greencapitaltrade/deadpool/pr-150 #3 stage from-build-pack and container step-git-clone
git cloning url: https://github.com/greencapitaltrade/deadpool.git version refs/pull/150/head:PR-150@fff867fddef3e23754c0bee95b41a154c7ae61e1 to dir: source
Cloning into 'source'...
From https://github.com/greencapitaltrade/deadpool
 * [new ref]         refs/pull/150/head -> PR-150
Switched to branch 'PR-150'
HEAD is now at fff867f Merge pull request #159 from greencapitaltrade/jarvis/issue-152
checked out revision: refs/pull/150/head:PR-150@fff867fddef3e23754c0bee95b41a154c7ae61e1 to dir: source

Showing logs for build greencapitaltrade/deadpool/pr-150 #3 stage from-build-pack and container step-git-merge
setup git user  email jenkins-x@googlegroups.com
Using SHAs from PULL_REFS=main:5ad240c51b208dfed8ef34b77384b1c341350140,150:fff867fddef3e23754c0bee95b41a154c7ae61e1:refs/pull/150/head
using base branch main and base sha 5ad240c51b208dfed8ef34b77384b1c341350140
merging sha: fff867fddef3e23754c0bee95b41a154c7ae61e1
error: error during merge: merging fff867fddef3e23754c0bee95b41a154c7ae61e1 into main: failed to run 'git merge fff867fddef3e23754c0bee95b41a154c7ae61e1' command in directory '.', output: 'Auto-merging JARVIS_TECH_CONTRACT.md
CONFLICT (content): Merge conflict in JARVIS_TECH_CONTRACT.md
Auto-merging services/iot-consumer/Cargo.toml
CONFLICT (content): Merge conflict in services/iot-consumer/Cargo.toml
Auto-merging services/iot-consumer/src/lib.rs
CONFLICT (content): Merge conflict in services/iot-consumer/src/lib.rs
Auto-merging services/iot-consumer/src/main.rs
CONFLICT (content): Merge conflict in services/iot-consumer/src/main.rs
Auto-merging services/iot-consumer/src/metrics.rs
CONFLICT (add/add): Merge conflict in services/iot-consumer/src/metrics.rs
Auto-merging services/iot-consumer/src/processor.rs
CONFLICT (content): Merge conflict in services/iot-consumer/src/processor.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.