Showing logs for build greencapitaltrade/flash/pr-235 #5 stage from-build-pack and container prepare 2026/06/28 15:15:03 Entrypoint initialization Showing logs for build greencapitaltrade/flash/pr-235 #5 stage from-build-pack and container place-scripts 2026/06/28 15:15:03 Decoded script /tekton/scripts/script-0-b6297 2026/06/28 15:15:03 Decoded script /tekton/scripts/script-1-cc64n 2026/06/28 15:15:03 Decoded script /tekton/scripts/script-2-h8vhz 2026/06/28 15:15:03 Decoded script /tekton/scripts/script-3-lhmnb 2026/06/28 15:15:03 Decoded script /tekton/scripts/script-4-g48kd 2026/06/28 15:15:03 Decoded script /tekton/scripts/script-5-sk274 2026/06/28 15:15:03 Decoded script /tekton/scripts/script-6-b4dd5 2026/06/28 15:15:03 Decoded script /tekton/scripts/script-8-5d7w7 2026/06/28 15:15:03 Decoded script /tekton/scripts/script-9-zdngs Showing logs for build greencapitaltrade/flash/pr-235 #5 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/flash/pr-235 #5 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/flash.git version refs/pull/235/head:PR-235@13b04817eb72aa04e1d44716f1d0df3af6930c77 to dir: source Cloning into 'source'... From https://github.com/greencapitaltrade/flash * [new ref] refs/pull/235/head -> PR-235 Switched to branch 'PR-235' HEAD is now at 13b0481 refactor(ci): replace jx-boot with node:26-slim + curl for sticky PR comments checked out revision: refs/pull/235/head:PR-235@13b04817eb72aa04e1d44716f1d0df3af6930c77 to dir: source Showing logs for build greencapitaltrade/flash/pr-235 #5 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:53dd8144c58699b42ce640a3a97c09de047f5e8f,235:13b04817eb72aa04e1d44716f1d0df3af6930c77:refs/pull/235/head using base branch main and base sha 53dd8144c58699b42ce640a3a97c09de047f5e8f merging sha: 13b04817eb72aa04e1d44716f1d0df3af6930c77 error: error during merge: merging 13b04817eb72aa04e1d44716f1d0df3af6930c77 into main: failed to run 'git merge 13b04817eb72aa04e1d44716f1d0df3af6930c77' command in directory '.', output: 'Auto-merging .lighthouse/jenkins-x/pullrequest.yaml CONFLICT (content): Merge conflict in .lighthouse/jenkins-x/pullrequest.yaml 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.