Showing logs for build greencapitaltrade/flash/pr-235 #7 stage from-build-pack and container prepare 2026/06/28 15:43:47 Entrypoint initialization Showing logs for build greencapitaltrade/flash/pr-235 #7 stage from-build-pack and container place-scripts 2026/06/28 15:43:48 Decoded script /tekton/scripts/script-0-6w6kg 2026/06/28 15:43:48 Decoded script /tekton/scripts/script-1-dxffs 2026/06/28 15:43:48 Decoded script /tekton/scripts/script-2-pxzh8 2026/06/28 15:43:48 Decoded script /tekton/scripts/script-3-vgdmr 2026/06/28 15:43:48 Decoded script /tekton/scripts/script-4-gw6ks 2026/06/28 15:43:48 Decoded script /tekton/scripts/script-5-rgjcz 2026/06/28 15:43:48 Decoded script /tekton/scripts/script-6-wtx25 2026/06/28 15:43:48 Decoded script /tekton/scripts/script-7-ngn7s 2026/06/28 15:43:48 Decoded script /tekton/scripts/script-9-p2rv6 2026/06/28 15:43:48 Decoded script /tekton/scripts/script-10-mmcr5 Showing logs for build greencapitaltrade/flash/pr-235 #7 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/flash/pr-235 #7 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@aacdb57e959f30f22a22f187594ec9f2fbf87156 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 aacdb57 fix(ci): skip post-stage-comment when no junit report exists checked out revision: refs/pull/235/head:PR-235@aacdb57e959f30f22a22f187594ec9f2fbf87156 to dir: source Showing logs for build greencapitaltrade/flash/pr-235 #7 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:aacdb57e959f30f22a22f187594ec9f2fbf87156:refs/pull/235/head using base branch main and base sha 53dd8144c58699b42ce640a3a97c09de047f5e8f merging sha: aacdb57e959f30f22a22f187594ec9f2fbf87156 error: error during merge: merging aacdb57e959f30f22a22f187594ec9f2fbf87156 into main: failed to run 'git merge aacdb57e959f30f22a22f187594ec9f2fbf87156' 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.