Showing logs for build greencapitaltrade/flash/pr-241 #4 stage from-build-pack and container prepare 2026/06/28 16:27:51 Entrypoint initialization Showing logs for build greencapitaltrade/flash/pr-241 #4 stage from-build-pack and container place-scripts 2026/06/28 16:27:52 Decoded script /tekton/scripts/script-0-h2nv8 2026/06/28 16:27:52 Decoded script /tekton/scripts/script-1-j7xg2 2026/06/28 16:27:52 Decoded script /tekton/scripts/script-2-7wgcg 2026/06/28 16:27:52 Decoded script /tekton/scripts/script-3-bc427 2026/06/28 16:27:52 Decoded script /tekton/scripts/script-4-jncwq 2026/06/28 16:27:52 Decoded script /tekton/scripts/script-5-5njdj 2026/06/28 16:27:52 Decoded script /tekton/scripts/script-6-zdqkq 2026/06/28 16:27:52 Decoded script /tekton/scripts/script-8-p8xz6 2026/06/28 16:27:52 Decoded script /tekton/scripts/script-9-khjtn Showing logs for build greencapitaltrade/flash/pr-241 #4 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/flash/pr-241 #4 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/flash.git version refs/pull/241/head:PR-241@fd2fb75c9c737449c1b0eb1daa3995e74796c866 to dir: source Cloning into 'source'... From https://github.com/greencapitaltrade/flash * [new ref] refs/pull/241/head -> PR-241 Switched to branch 'PR-241' HEAD is now at fd2fb75 fix(ci): make e2e-fleet-creds secret refs optional checked out revision: refs/pull/241/head:PR-241@fd2fb75c9c737449c1b0eb1daa3995e74796c866 to dir: source Showing logs for build greencapitaltrade/flash/pr-241 #4 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:53dd8144c58699b42ce640a3a97c09de047f5e8f,241:fd2fb75c9c737449c1b0eb1daa3995e74796c866:refs/pull/241/head using base branch main and base sha 53dd8144c58699b42ce640a3a97c09de047f5e8f merging sha: fd2fb75c9c737449c1b0eb1daa3995e74796c866 error: error during merge: merging fd2fb75c9c737449c1b0eb1daa3995e74796c866 into main: failed to run 'git merge fd2fb75c9c737449c1b0eb1daa3995e74796c866' 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. Showing logs for build greencapitaltrade/flash/pr-241 #4 stage from-build-pack and container prepare 2026/06/28 16:27:51 Entrypoint initialization Showing logs for build greencapitaltrade/flash/pr-241 #4 stage from-build-pack and container place-scripts 2026/06/28 16:27:52 Decoded script /tekton/scripts/script-0-h2nv8 2026/06/28 16:27:52 Decoded script /tekton/scripts/script-1-j7xg2 2026/06/28 16:27:52 Decoded script /tekton/scripts/script-2-7wgcg 2026/06/28 16:27:52 Decoded script /tekton/scripts/script-3-bc427 2026/06/28 16:27:52 Decoded script /tekton/scripts/script-4-jncwq 2026/06/28 16:27:52 Decoded script /tekton/scripts/script-5-5njdj 2026/06/28 16:27:52 Decoded script /tekton/scripts/script-6-zdqkq 2026/06/28 16:27:52 Decoded script /tekton/scripts/script-8-p8xz6 2026/06/28 16:27:52 Decoded script /tekton/scripts/script-9-khjtn Showing logs for build greencapitaltrade/flash/pr-241 #4 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/flash/pr-241 #4 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/flash.git version refs/pull/241/head:PR-241@fd2fb75c9c737449c1b0eb1daa3995e74796c866 to dir: source Cloning into 'source'... From https://github.com/greencapitaltrade/flash * [new ref] refs/pull/241/head -> PR-241 Switched to branch 'PR-241' HEAD is now at fd2fb75 fix(ci): make e2e-fleet-creds secret refs optional checked out revision: refs/pull/241/head:PR-241@fd2fb75c9c737449c1b0eb1daa3995e74796c866 to dir: source Showing logs for build greencapitaltrade/flash/pr-241 #4 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:53dd8144c58699b42ce640a3a97c09de047f5e8f,241:fd2fb75c9c737449c1b0eb1daa3995e74796c866:refs/pull/241/head using base branch main and base sha 53dd8144c58699b42ce640a3a97c09de047f5e8f merging sha: fd2fb75c9c737449c1b0eb1daa3995e74796c866 error: error during merge: merging fd2fb75c9c737449c1b0eb1daa3995e74796c866 into main: failed to run 'git merge fd2fb75c9c737449c1b0eb1daa3995e74796c866' 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. Showing logs for build greencapitaltrade/flash/pr-241 #4 stage from-build-pack and container prepare 2026/06/28 16:27:51 Entrypoint initialization Showing logs for build greencapitaltrade/flash/pr-241 #4 stage from-build-pack and container place-scripts 2026/06/28 16:27:52 Decoded script /tekton/scripts/script-0-h2nv8 2026/06/28 16:27:52 Decoded script /tekton/scripts/script-1-j7xg2 2026/06/28 16:27:52 Decoded script /tekton/scripts/script-2-7wgcg 2026/06/28 16:27:52 Decoded script /tekton/scripts/script-3-bc427 2026/06/28 16:27:52 Decoded script /tekton/scripts/script-4-jncwq 2026/06/28 16:27:52 Decoded script /tekton/scripts/script-5-5njdj 2026/06/28 16:27:52 Decoded script /tekton/scripts/script-6-zdqkq 2026/06/28 16:27:52 Decoded script /tekton/scripts/script-8-p8xz6 2026/06/28 16:27:52 Decoded script /tekton/scripts/script-9-khjtn Showing logs for build greencapitaltrade/flash/pr-241 #4 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/flash/pr-241 #4 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/flash.git version refs/pull/241/head:PR-241@fd2fb75c9c737449c1b0eb1daa3995e74796c866 to dir: source Cloning into 'source'... From https://github.com/greencapitaltrade/flash * [new ref] refs/pull/241/head -> PR-241 Switched to branch 'PR-241' HEAD is now at fd2fb75 fix(ci): make e2e-fleet-creds secret refs optional checked out revision: refs/pull/241/head:PR-241@fd2fb75c9c737449c1b0eb1daa3995e74796c866 to dir: source Showing logs for build greencapitaltrade/flash/pr-241 #4 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:53dd8144c58699b42ce640a3a97c09de047f5e8f,241:fd2fb75c9c737449c1b0eb1daa3995e74796c866:refs/pull/241/head using base branch main and base sha 53dd8144c58699b42ce640a3a97c09de047f5e8f merging sha: fd2fb75c9c737449c1b0eb1daa3995e74796c866 error: error during merge: merging fd2fb75c9c737449c1b0eb1daa3995e74796c866 into main: failed to run 'git merge fd2fb75c9c737449c1b0eb1daa3995e74796c866' 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.