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

Showing logs for build greencapitaltrade/flash/pr-154 #3 stage from-build-pack and container place-scripts
2026/09/12 19:27:44 Decoded script /tekton/scripts/script-0-tc6gp
2026/09/12 19:27:44 Decoded script /tekton/scripts/script-1-7dq7l
2026/09/12 19:27:44 Decoded script /tekton/scripts/script-2-llltt
2026/09/12 19:27:44 Decoded script /tekton/scripts/script-3-86kzn
2026/09/12 19:27:44 Decoded script /tekton/scripts/script-4-ll6nv
2026/09/12 19:27:44 Decoded script /tekton/scripts/script-5-n2fj4
2026/09/12 19:27:44 Decoded script /tekton/scripts/script-6-t2vzg
2026/09/12 19:27:44 Decoded script /tekton/scripts/script-7-k9vk8
2026/09/12 19:27:44 Decoded script /tekton/scripts/script-8-phwr8
2026/09/12 19:27:44 Decoded script /tekton/scripts/script-9-6jkkr
2026/09/12 19:27:44 Decoded script /tekton/scripts/script-11-hgdm8
2026/09/12 19:27:44 Decoded script /tekton/scripts/script-12-p74gx

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

Showing logs for build greencapitaltrade/flash/pr-154 #3 stage from-build-pack and container step-git-clone
git cloning url: https://github.com/greencapitaltrade/flash.git version refs/pull/154/head:PR-154@2569faf1c16b22f35cc467548e661f2823f0d128 to dir: source
Cloning into 'source'...
From https://github.com/greencapitaltrade/flash
 * [new ref]           refs/pull/154/head -> PR-154
Switched to branch 'PR-154'
HEAD is now at 2569faf1 feat(iot): source device-type mapping from assetIotTypes API (closes #145)
checked out revision: refs/pull/154/head:PR-154@2569faf1c16b22f35cc467548e661f2823f0d128 to dir: source

Showing logs for build greencapitaltrade/flash/pr-154 #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,154:2569faf1c16b22f35cc467548e661f2823f0d128:refs/pull/154/head
using base branch main and base sha c62240d1d1c96e11777fca29c38cd8f963b56b82
merging sha: 2569faf1c16b22f35cc467548e661f2823f0d128
error: error during merge: merging 2569faf1c16b22f35cc467548e661f2823f0d128 into main: failed to run 'git merge 2569faf1c16b22f35cc467548e661f2823f0d128' command in directory '.', output: 'Auto-merging packages/app/features/asset/screens/AssetSettingsScreen.tsx
CONFLICT (content): Merge conflict in packages/app/features/asset/screens/AssetSettingsScreen.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.