Showing logs for build greencapitaltrade/flash/pr-235 #6 stage from-build-pack and container prepare
2026/06/28 15:25:15 Entrypoint initialization

Showing logs for build greencapitaltrade/flash/pr-235 #6 stage from-build-pack and container place-scripts
2026/06/28 15:25:15 Decoded script /tekton/scripts/script-0-px7r7
2026/06/28 15:25:15 Decoded script /tekton/scripts/script-1-nh8jv
2026/06/28 15:25:15 Decoded script /tekton/scripts/script-2-gnbf4
2026/06/28 15:25:15 Decoded script /tekton/scripts/script-3-p6dnm
2026/06/28 15:25:15 Decoded script /tekton/scripts/script-4-lmtwt
2026/06/28 15:25:15 Decoded script /tekton/scripts/script-5-cmwph
2026/06/28 15:25:15 Decoded script /tekton/scripts/script-6-87fxq
2026/06/28 15:25:15 Decoded script /tekton/scripts/script-7-9v68k
2026/06/28 15:25:15 Decoded script /tekton/scripts/script-9-d29rr
2026/06/28 15:25:15 Decoded script /tekton/scripts/script-10-tbtmj

Showing logs for build greencapitaltrade/flash/pr-235 #6 stage from-build-pack and container working-dir-initializer

Showing logs for build greencapitaltrade/flash/pr-235 #6 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@6210d7e6bd87db57f931f3b64d031ad89f3659f0 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 6210d7e feat(ci): restore standalone post-stage-comment.mjs with test runner step
checked out revision: refs/pull/235/head:PR-235@6210d7e6bd87db57f931f3b64d031ad89f3659f0 to dir: source

Showing logs for build greencapitaltrade/flash/pr-235 #6 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:6210d7e6bd87db57f931f3b64d031ad89f3659f0:refs/pull/235/head
using base branch main and base sha 53dd8144c58699b42ce640a3a97c09de047f5e8f
merging sha: 6210d7e6bd87db57f931f3b64d031ad89f3659f0
error: error during merge: merging 6210d7e6bd87db57f931f3b64d031ad89f3659f0 into main: failed to run 'git merge 6210d7e6bd87db57f931f3b64d031ad89f3659f0' 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.