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

Showing logs for build greencapitaltrade/flash/pr-318 #3 stage from-build-pack and container place-scripts
2026/09/12 19:26:50 Decoded script /tekton/scripts/script-0-cbpkg
2026/09/12 19:26:50 Decoded script /tekton/scripts/script-1-xfbfp
2026/09/12 19:26:50 Decoded script /tekton/scripts/script-2-6x88p
2026/09/12 19:26:50 Decoded script /tekton/scripts/script-3-p7gz2
2026/09/12 19:26:50 Decoded script /tekton/scripts/script-4-x9xqf
2026/09/12 19:26:50 Decoded script /tekton/scripts/script-5-2qkvk
2026/09/12 19:26:50 Decoded script /tekton/scripts/script-6-9nn4l
2026/09/12 19:26:50 Decoded script /tekton/scripts/script-7-rl2ns
2026/09/12 19:26:50 Decoded script /tekton/scripts/script-8-xrz4b
2026/09/12 19:26:50 Decoded script /tekton/scripts/script-9-9qgnj
2026/09/12 19:26:50 Decoded script /tekton/scripts/script-11-wql4s
2026/09/12 19:26:50 Decoded script /tekton/scripts/script-12-mhjc9

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

Showing logs for build greencapitaltrade/flash/pr-318 #3 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@15106a34c68408e43b95d472ad52a41e11d3b052 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 15106a34 fix(assets): populate fuel/speed filter modal and fix close button contrast
checked out revision: refs/pull/318/head:PR-318@15106a34c68408e43b95d472ad52a41e11d3b052 to dir: source

Showing logs for build greencapitaltrade/flash/pr-318 #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,318:15106a34c68408e43b95d472ad52a41e11d3b052:refs/pull/318/head
using base branch main and base sha c62240d1d1c96e11777fca29c38cd8f963b56b82
merging sha: 15106a34c68408e43b95d472ad52a41e11d3b052
error: error during merge: merging 15106a34c68408e43b95d472ad52a41e11d3b052 into main: failed to run 'git merge 15106a34c68408e43b95d472ad52a41e11d3b052' 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.