Showing logs for build greencapitaltrade/flash/pr-241 #6 stage from-build-pack and container prepare 2026/09/12 19:26:13 Entrypoint initialization Showing logs for build greencapitaltrade/flash/pr-241 #6 stage from-build-pack and container place-scripts 2026/09/12 19:26:14 Decoded script /tekton/scripts/script-0-mklgl 2026/09/12 19:26:14 Decoded script /tekton/scripts/script-1-jq7j5 2026/09/12 19:26:14 Decoded script /tekton/scripts/script-2-rdtr8 2026/09/12 19:26:14 Decoded script /tekton/scripts/script-3-bjj9k 2026/09/12 19:26:14 Decoded script /tekton/scripts/script-4-tsmq8 2026/09/12 19:26:14 Decoded script /tekton/scripts/script-5-6v7mv 2026/09/12 19:26:14 Decoded script /tekton/scripts/script-6-hjgdc 2026/09/12 19:26:14 Decoded script /tekton/scripts/script-7-l44gr 2026/09/12 19:26:14 Decoded script /tekton/scripts/script-8-56w26 2026/09/12 19:26:14 Decoded script /tekton/scripts/script-9-dkkkj 2026/09/12 19:26:14 Decoded script /tekton/scripts/script-10-8kfxd 2026/09/12 19:26:14 Decoded script /tekton/scripts/script-12-nnn2r 2026/09/12 19:26:14 Decoded script /tekton/scripts/script-13-dhfpg Showing logs for build greencapitaltrade/flash/pr-241 #6 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/flash/pr-241 #6 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@f12bf3536372b14d3ba523da11a251698126ad69 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 f12bf353 docs(e2e): fix stale Fury URL and misleading comments in integration test docs checked out revision: refs/pull/241/head:PR-241@f12bf3536372b14d3ba523da11a251698126ad69 to dir: source Showing logs for build greencapitaltrade/flash/pr-241 #6 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:c62240d1d1c96e11777fca29c38cd8f963b56b82,241:f12bf3536372b14d3ba523da11a251698126ad69:refs/pull/241/head using base branch main and base sha c62240d1d1c96e11777fca29c38cd8f963b56b82 merging sha: f12bf3536372b14d3ba523da11a251698126ad69 error: error during merge: merging f12bf3536372b14d3ba523da11a251698126ad69 into main: failed to run 'git merge f12bf3536372b14d3ba523da11a251698126ad69' command in directory '.', output: 'Auto-merging .lighthouse/jenkins-x/pullrequest.yaml Auto-merging package.json CONFLICT (content): Merge conflict in package.json Auto-merging vitest.config.mts CONFLICT (content): Merge conflict in vitest.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. Showing logs for build greencapitaltrade/flash/pr-241 #6 stage from-build-pack and container prepare 2026/09/12 19:26:13 Entrypoint initialization Showing logs for build greencapitaltrade/flash/pr-241 #6 stage from-build-pack and container place-scripts 2026/09/12 19:26:14 Decoded script /tekton/scripts/script-0-mklgl 2026/09/12 19:26:14 Decoded script /tekton/scripts/script-1-jq7j5 2026/09/12 19:26:14 Decoded script /tekton/scripts/script-2-rdtr8 2026/09/12 19:26:14 Decoded script /tekton/scripts/script-3-bjj9k 2026/09/12 19:26:14 Decoded script /tekton/scripts/script-4-tsmq8 2026/09/12 19:26:14 Decoded script /tekton/scripts/script-5-6v7mv 2026/09/12 19:26:14 Decoded script /tekton/scripts/script-6-hjgdc 2026/09/12 19:26:14 Decoded script /tekton/scripts/script-7-l44gr 2026/09/12 19:26:14 Decoded script /tekton/scripts/script-8-56w26 2026/09/12 19:26:14 Decoded script /tekton/scripts/script-9-dkkkj 2026/09/12 19:26:14 Decoded script /tekton/scripts/script-10-8kfxd 2026/09/12 19:26:14 Decoded script /tekton/scripts/script-12-nnn2r 2026/09/12 19:26:14 Decoded script /tekton/scripts/script-13-dhfpg Showing logs for build greencapitaltrade/flash/pr-241 #6 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/flash/pr-241 #6 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@f12bf3536372b14d3ba523da11a251698126ad69 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 f12bf353 docs(e2e): fix stale Fury URL and misleading comments in integration test docs checked out revision: refs/pull/241/head:PR-241@f12bf3536372b14d3ba523da11a251698126ad69 to dir: source Showing logs for build greencapitaltrade/flash/pr-241 #6 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:c62240d1d1c96e11777fca29c38cd8f963b56b82,241:f12bf3536372b14d3ba523da11a251698126ad69:refs/pull/241/head using base branch main and base sha c62240d1d1c96e11777fca29c38cd8f963b56b82 merging sha: f12bf3536372b14d3ba523da11a251698126ad69 error: error during merge: merging f12bf3536372b14d3ba523da11a251698126ad69 into main: failed to run 'git merge f12bf3536372b14d3ba523da11a251698126ad69' command in directory '.', output: 'Auto-merging .lighthouse/jenkins-x/pullrequest.yaml Auto-merging package.json CONFLICT (content): Merge conflict in package.json Auto-merging vitest.config.mts CONFLICT (content): Merge conflict in vitest.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.