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

Showing logs for build greencapitaltrade/flash/pr-54 #7 stage from-build-pack and container place-scripts
2026/05/16 13:03:26 Decoded script /tekton/scripts/script-0-sxvtb
2026/05/16 13:03:26 Decoded script /tekton/scripts/script-1-km826
2026/05/16 13:03:26 Decoded script /tekton/scripts/script-2-ftq9q
2026/05/16 13:03:26 Decoded script /tekton/scripts/script-3-dlw66
2026/05/16 13:03:26 Decoded script /tekton/scripts/script-4-bzv87
2026/05/16 13:03:27 Decoded script /tekton/scripts/script-6-lbjjs
2026/05/16 13:03:27 Decoded script /tekton/scripts/script-7-zcfcw

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

Showing logs for build greencapitaltrade/flash/pr-54 #7 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@b300bc85381538a08d00d3ab0e570074d0e863fa 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 b300bc8 fix: preview pod tolerations + drop dead build-pool affinity
checked out revision: refs/pull/54/head:PR-54@b300bc85381538a08d00d3ab0e570074d0e863fa to dir: source

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