Showing logs for build greencapitaltrade/flash/pr-302 #5 stage from-build-pack and container prepare 2026/09/12 18:07:17 Entrypoint initialization Showing logs for build greencapitaltrade/flash/pr-302 #5 stage from-build-pack and container place-scripts 2026/09/12 18:07:18 Decoded script /tekton/scripts/script-0-6p87j 2026/09/12 18:07:18 Decoded script /tekton/scripts/script-1-jjqzs 2026/09/12 18:07:18 Decoded script /tekton/scripts/script-2-zx7q9 2026/09/12 18:07:18 Decoded script /tekton/scripts/script-3-pts6m 2026/09/12 18:07:18 Decoded script /tekton/scripts/script-4-vrszl 2026/09/12 18:07:18 Decoded script /tekton/scripts/script-5-cv89z 2026/09/12 18:07:18 Decoded script /tekton/scripts/script-6-j5wlq 2026/09/12 18:07:18 Decoded script /tekton/scripts/script-7-z4q6d 2026/09/12 18:07:18 Decoded script /tekton/scripts/script-8-qldhj 2026/09/12 18:07:18 Decoded script /tekton/scripts/script-9-2rlsj 2026/09/12 18:07:18 Decoded script /tekton/scripts/script-10-n7whd 2026/09/12 18:07:18 Decoded script /tekton/scripts/script-11-hskcr 2026/09/12 18:07:18 Decoded script /tekton/scripts/script-13-d7b8b 2026/09/12 18:07:18 Decoded script /tekton/scripts/script-14-qwwp7 2026/09/12 18:07:19 Decoded script /tekton/scripts/script-15-ls7nf Showing logs for build greencapitaltrade/flash/pr-302 #5 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/flash/pr-302 #5 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/flash.git version refs/pull/302/head:PR-302@9a5d76800cbd8bf768ab84ce90aaade2a96ed71e to dir: source Cloning into 'source'... From https://github.com/greencapitaltrade/flash * [new ref] refs/pull/302/head -> PR-302 Switched to branch 'PR-302' HEAD is now at 9a5d7680 docs(ci): flag unverified preview-URL hostname assumption in acceptance step checked out revision: refs/pull/302/head:PR-302@9a5d76800cbd8bf768ab84ce90aaade2a96ed71e to dir: source Showing logs for build greencapitaltrade/flash/pr-302 #5 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:7bcb2f4c19213ebc511ba1f29b7b899b2a3c0f3b,302:9a5d76800cbd8bf768ab84ce90aaade2a96ed71e:refs/pull/302/head using base branch main and base sha 7bcb2f4c19213ebc511ba1f29b7b899b2a3c0f3b merging sha: 9a5d76800cbd8bf768ab84ce90aaade2a96ed71e error: error during merge: merging 9a5d76800cbd8bf768ab84ce90aaade2a96ed71e into main: failed to run 'git merge 9a5d76800cbd8bf768ab84ce90aaade2a96ed71e' command in directory '.', output: 'Auto-merging .gitignore CONFLICT (content): Merge conflict in .gitignore Auto-merging .lighthouse/jenkins-x/pullrequest.yaml Auto-merging package.json CONFLICT (content): Merge conflict in package.json Auto-merging vitest.integration.config.mts CONFLICT (add/add): Merge conflict in vitest.integration.config.mts 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.