Showing logs for build greencapitaltrade/deadpool/pr-107 #4 stage from-build-pack and container prepare 2026/07/10 15:59:12 Entrypoint initialization Showing logs for build greencapitaltrade/deadpool/pr-107 #4 stage from-build-pack and container place-scripts 2026/07/10 15:59:12 Decoded script /tekton/scripts/script-0-qs42n 2026/07/10 15:59:12 Decoded script /tekton/scripts/script-1-58pph 2026/07/10 15:59:12 Decoded script /tekton/scripts/script-2-x6nz7 2026/07/10 15:59:12 Decoded script /tekton/scripts/script-3-txtbk 2026/07/10 15:59:12 Decoded script /tekton/scripts/script-4-wqmln 2026/07/10 15:59:12 Decoded script /tekton/scripts/script-6-jrbhh 2026/07/10 15:59:12 Decoded script /tekton/scripts/script-7-rjsks 2026/07/10 15:59:12 Decoded script /tekton/scripts/script-8-6n2wm 2026/07/10 15:59:12 Decoded script /tekton/scripts/script-9-q4wbb Showing logs for build greencapitaltrade/deadpool/pr-107 #4 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/deadpool/pr-107 #4 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/deadpool.git version refs/pull/107/head:PR-107@951fade57fdc9e516d5087e2b63a8bb97f4d0d82 to dir: source Cloning into 'source'... From https://github.com/greencapitaltrade/deadpool * [new ref] refs/pull/107/head -> PR-107 Switched to branch 'PR-107' HEAD is now at 951fade fix(gt06): populate fuel_readings in GPS-fix pact provider state checked out revision: refs/pull/107/head:PR-107@951fade57fdc9e516d5087e2b63a8bb97f4d0d82 to dir: source Showing logs for build greencapitaltrade/deadpool/pr-107 #4 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:141db79c8be8f9e5ce5ab635d1a1c4e2ad1c7a3e,107:951fade57fdc9e516d5087e2b63a8bb97f4d0d82:refs/pull/107/head using base branch main and base sha 141db79c8be8f9e5ce5ab635d1a1c4e2ad1c7a3e merging sha: 951fade57fdc9e516d5087e2b63a8bb97f4d0d82 error: error during merge: merging 951fade57fdc9e516d5087e2b63a8bb97f4d0d82 into main: failed to run 'git merge 951fade57fdc9e516d5087e2b63a8bb97f4d0d82' command in directory '.', output: 'Auto-merging services/iot-consumer/tests/pact_verify.rs CONFLICT (content): Merge conflict in services/iot-consumer/tests/pact_verify.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.