Showing logs for build greencapitaltrade/flash/pr-150 #3 stage from-build-pack and container prepare
2026/09/12 19:27:12 Entrypoint initialization

Showing logs for build greencapitaltrade/flash/pr-150 #3 stage from-build-pack and container place-scripts
2026/09/12 19:27:13 Decoded script /tekton/scripts/script-0-spzsr
2026/09/12 19:27:13 Decoded script /tekton/scripts/script-1-sfn8c
2026/09/12 19:27:13 Decoded script /tekton/scripts/script-2-sbrfm
2026/09/12 19:27:13 Decoded script /tekton/scripts/script-3-2skdr
2026/09/12 19:27:13 Decoded script /tekton/scripts/script-4-278vx
2026/09/12 19:27:13 Decoded script /tekton/scripts/script-5-58vt4
2026/09/12 19:27:13 Decoded script /tekton/scripts/script-6-gxfnw
2026/09/12 19:27:13 Decoded script /tekton/scripts/script-7-p2jrc
2026/09/12 19:27:13 Decoded script /tekton/scripts/script-8-mbf65
2026/09/12 19:27:13 Decoded script /tekton/scripts/script-9-nfkb9
2026/09/12 19:27:13 Decoded script /tekton/scripts/script-11-hk5tz
2026/09/12 19:27:13 Decoded script /tekton/scripts/script-12-7zql7

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

Showing logs for build greencapitaltrade/flash/pr-150 #3 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@41c1d83dfce33dc708c92dc778d589b260bf92d3 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 41c1d83d fix(asset): hide per-card Commands button when no commands are wired
checked out revision: refs/pull/150/head:PR-150@41c1d83dfce33dc708c92dc778d589b260bf92d3 to dir: source

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