Showing logs for build greencapitaltrade/deadpool/pr-107 #2 stage from-build-pack and container prepare 2026/07/10 15:02:31 Entrypoint initialization Showing logs for build greencapitaltrade/deadpool/pr-107 #2 stage from-build-pack and container place-scripts 2026/07/10 15:02:32 Decoded script /tekton/scripts/script-0-phgjb 2026/07/10 15:02:32 Decoded script /tekton/scripts/script-1-fqnt5 2026/07/10 15:02:32 Decoded script /tekton/scripts/script-2-s62cs 2026/07/10 15:02:32 Decoded script /tekton/scripts/script-3-dr48j 2026/07/10 15:02:32 Decoded script /tekton/scripts/script-4-fp5c5 2026/07/10 15:02:32 Decoded script /tekton/scripts/script-6-jkdbh 2026/07/10 15:02:32 Decoded script /tekton/scripts/script-7-ghxff 2026/07/10 15:02:32 Decoded script /tekton/scripts/script-8-lnmrx 2026/07/10 15:02:32 Decoded script /tekton/scripts/script-9-t4pft Showing logs for build greencapitaltrade/deadpool/pr-107 #2 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/deadpool/pr-107 #2 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@36d84999fcd8f95141b93b9646fe9a71f157b7dc 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 36d8499 fix(gt06): update pact provider state for (0,0) omission, clarify speed test checked out revision: refs/pull/107/head:PR-107@36d84999fcd8f95141b93b9646fe9a71f157b7dc to dir: source Showing logs for build greencapitaltrade/deadpool/pr-107 #2 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:a41ffc004d010792e952cd3a72293e453fc15c0c,107:36d84999fcd8f95141b93b9646fe9a71f157b7dc:refs/pull/107/head using base branch main and base sha a41ffc004d010792e952cd3a72293e453fc15c0c merging sha: 36d84999fcd8f95141b93b9646fe9a71f157b7dc error: error during merge: merging 36d84999fcd8f95141b93b9646fe9a71f157b7dc into main: failed to run 'git merge 36d84999fcd8f95141b93b9646fe9a71f157b7dc' 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.