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

Showing logs for build greencapitaltrade/flash/pr-318 #2 stage from-build-pack and container place-scripts
2026/09/12 18:06:48 Decoded script /tekton/scripts/script-0-gfwqm
2026/09/12 18:06:48 Decoded script /tekton/scripts/script-1-j972f
2026/09/12 18:06:48 Decoded script /tekton/scripts/script-2-5rmnq
2026/09/12 18:06:48 Decoded script /tekton/scripts/script-3-xl8nl
2026/09/12 18:06:48 Decoded script /tekton/scripts/script-4-7l42s
2026/09/12 18:06:48 Decoded script /tekton/scripts/script-5-kf6jc
2026/09/12 18:06:48 Decoded script /tekton/scripts/script-6-tv2hf
2026/09/12 18:06:48 Decoded script /tekton/scripts/script-7-wxjcn
2026/09/12 18:06:48 Decoded script /tekton/scripts/script-8-knncn
2026/09/12 18:06:48 Decoded script /tekton/scripts/script-9-kftbp
2026/09/12 18:06:48 Decoded script /tekton/scripts/script-11-lmmj5
2026/09/12 18:06:48 Decoded script /tekton/scripts/script-12-x89sg

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

Showing logs for build greencapitaltrade/flash/pr-318 #2 stage from-build-pack and container step-git-clone
git cloning url: https://github.com/greencapitaltrade/flash.git version refs/pull/318/head:PR-318@af72b9924eb0d41ad5a4e00de57bdc03b1b69a1f to dir: source
Cloning into 'source'...
From https://github.com/greencapitaltrade/flash
 * [new ref]           refs/pull/318/head -> PR-318
Switched to branch 'PR-318'
HEAD is now at af72b992 fix(assets): populate fuel/speed filter modal and fix close button contrast
checked out revision: refs/pull/318/head:PR-318@af72b9924eb0d41ad5a4e00de57bdc03b1b69a1f to dir: source

Showing logs for build greencapitaltrade/flash/pr-318 #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,318:af72b9924eb0d41ad5a4e00de57bdc03b1b69a1f:refs/pull/318/head
using base branch main and base sha 7bcb2f4c19213ebc511ba1f29b7b899b2a3c0f3b
merging sha: af72b9924eb0d41ad5a4e00de57bdc03b1b69a1f
error: error during merge: merging af72b9924eb0d41ad5a4e00de57bdc03b1b69a1f into main: failed to run 'git merge af72b9924eb0d41ad5a4e00de57bdc03b1b69a1f' command in directory '.', output: 'Auto-merging packages/app/features/asset/components/IoTAssetView.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.