Showing logs for build greencapitaltrade/flash/pr-150 #2 stage from-build-pack and container prepare
2026/09/12 18:08:29 Entrypoint initialization

Showing logs for build greencapitaltrade/flash/pr-150 #2 stage from-build-pack and container place-scripts
2026/09/12 18:08:30 Decoded script /tekton/scripts/script-0-sd2t2
2026/09/12 18:08:30 Decoded script /tekton/scripts/script-1-67sp2
2026/09/12 18:08:30 Decoded script /tekton/scripts/script-2-f4h78
2026/09/12 18:08:30 Decoded script /tekton/scripts/script-3-578g6
2026/09/12 18:08:30 Decoded script /tekton/scripts/script-4-g9zwp
2026/09/12 18:08:30 Decoded script /tekton/scripts/script-5-cfbkz
2026/09/12 18:08:30 Decoded script /tekton/scripts/script-6-2rjrb
2026/09/12 18:08:30 Decoded script /tekton/scripts/script-7-4vclb
2026/09/12 18:08:30 Decoded script /tekton/scripts/script-8-92r5h
2026/09/12 18:08:30 Decoded script /tekton/scripts/script-9-b8dh4
2026/09/12 18:08:30 Decoded script /tekton/scripts/script-11-d64zx
2026/09/12 18:08:31 Decoded script /tekton/scripts/script-12-ggc4r

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

Showing logs for build greencapitaltrade/flash/pr-150 #2 stage from-build-pack and container step-git-clone
git cloning url: https://github.com/greencapitaltrade/flash.git version refs/pull/150/head:PR-150@1de001b2efa5ff7ba94df2ff8e2941fc29fe2582 to dir: source
Cloning into 'source'...
From https://github.com/greencapitaltrade/flash
 * [new ref]           refs/pull/150/head -> PR-150
Switched to branch 'PR-150'
HEAD is now at 1de001b2 fix(asset): hide per-card Commands button when no commands are wired
checked out revision: refs/pull/150/head:PR-150@1de001b2efa5ff7ba94df2ff8e2941fc29fe2582 to dir: source

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