Showing logs for build greencapitaltrade/flash/pr-54 #5 stage from-build-pack and container prepare
2026/05/16 03:54:06 Entrypoint initialization

Showing logs for build greencapitaltrade/flash/pr-54 #5 stage from-build-pack and container place-scripts
2026/05/16 03:54:06 Decoded script /tekton/scripts/script-0-t66qm
2026/05/16 03:54:06 Decoded script /tekton/scripts/script-1-bflm4
2026/05/16 03:54:06 Decoded script /tekton/scripts/script-2-qpg97
2026/05/16 03:54:06 Decoded script /tekton/scripts/script-3-sssg4
2026/05/16 03:54:06 Decoded script /tekton/scripts/script-4-759rv
2026/05/16 03:54:06 Decoded script /tekton/scripts/script-6-l9b76
2026/05/16 03:54:06 Decoded script /tekton/scripts/script-7-fkjx2

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

Showing logs for build greencapitaltrade/flash/pr-54 #5 stage from-build-pack and container step-git-clone
git cloning url: https://github.com/greencapitaltrade/flash.git version refs/pull/54/head:PR-54@d97f8fc1a63838c3b51bcf60ac995f4249419654 to dir: source
Cloning into 'source'...
From https://github.com/greencapitaltrade/flash
 * [new ref]         refs/pull/54/head -> PR-54
Switched to branch 'PR-54'
HEAD is now at d97f8fc fix: drop spot preference from build pipeline podTemplate
checked out revision: refs/pull/54/head:PR-54@d97f8fc1a63838c3b51bcf60ac995f4249419654 to dir: source

Showing logs for build greencapitaltrade/flash/pr-54 #5 stage from-build-pack and container step-git-merge
setup git user  email jenkins-x@googlegroups.com
Using SHAs from PULL_REFS=main:1273b9b8773d1efa01235754756654f7adc33371,54:d97f8fc1a63838c3b51bcf60ac995f4249419654:refs/pull/54/head
using base branch main and base sha 1273b9b8773d1efa01235754756654f7adc33371
merging sha: d97f8fc1a63838c3b51bcf60ac995f4249419654
error: error during merge: merging d97f8fc1a63838c3b51bcf60ac995f4249419654 into main: failed to run 'git merge d97f8fc1a63838c3b51bcf60ac995f4249419654' command in directory '.', output: 'Auto-merging packages/app/features/asset/components/IoTAssetView.tsx
CONFLICT (content): Merge conflict in packages/app/features/asset/components/IoTAssetView.tsx
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.