Showing logs for build greencapitaltrade/flash/pr-54 #2 stage from-build-pack and container prepare
2026/05/15 10:54:03 Entrypoint initialization

Showing logs for build greencapitaltrade/flash/pr-54 #2 stage from-build-pack and container place-scripts
2026/05/15 10:54:05 Decoded script /tekton/scripts/script-0-6mkd6
2026/05/15 10:54:05 Decoded script /tekton/scripts/script-1-d9dcv
2026/05/15 10:54:05 Decoded script /tekton/scripts/script-2-nnzj8
2026/05/15 10:54:05 Decoded script /tekton/scripts/script-3-xkgd6
2026/05/15 10:54:05 Decoded script /tekton/scripts/script-4-jmmhk
2026/05/15 10:54:06 Decoded script /tekton/scripts/script-6-lzkf5
2026/05/15 10:54:06 Decoded script /tekton/scripts/script-7-zvbjj

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

Showing logs for build greencapitaltrade/flash/pr-54 #2 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@4baaeba374230d55bc24a4b708f88c793019b109 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 4baaeba fix: drop dead build-pool affinity, prefer stateless
checked out revision: refs/pull/54/head:PR-54@4baaeba374230d55bc24a4b708f88c793019b109 to dir: source

Showing logs for build greencapitaltrade/flash/pr-54 #2 stage from-build-pack and container step-git-merge
setup git user  email jenkins-x@googlegroups.com
Using SHAs from PULL_REFS=main:25ad65dc6d9b34d27c80739cb9cb2fac238f1fe4,54:4baaeba374230d55bc24a4b708f88c793019b109:refs/pull/54/head
using base branch main and base sha 25ad65dc6d9b34d27c80739cb9cb2fac238f1fe4
merging sha: 4baaeba374230d55bc24a4b708f88c793019b109
error: error during merge: merging 4baaeba374230d55bc24a4b708f88c793019b109 into main: failed to run 'git merge 4baaeba374230d55bc24a4b708f88c793019b109' 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.