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

Showing logs for build greencapitaltrade/flash/pr-154 #2 stage from-build-pack and container place-scripts
2026/09/12 18:08:17 Decoded script /tekton/scripts/script-0-r7zjg
2026/09/12 18:08:17 Decoded script /tekton/scripts/script-1-2d2l4
2026/09/12 18:08:17 Decoded script /tekton/scripts/script-2-scsdr
2026/09/12 18:08:17 Decoded script /tekton/scripts/script-3-8jtc2
2026/09/12 18:08:17 Decoded script /tekton/scripts/script-4-clcdt
2026/09/12 18:08:17 Decoded script /tekton/scripts/script-5-gmkwx
2026/09/12 18:08:17 Decoded script /tekton/scripts/script-6-r29rl
2026/09/12 18:08:17 Decoded script /tekton/scripts/script-7-mtdkd
2026/09/12 18:08:17 Decoded script /tekton/scripts/script-8-p96pm
2026/09/12 18:08:17 Decoded script /tekton/scripts/script-9-m4hjm
2026/09/12 18:08:17 Decoded script /tekton/scripts/script-11-4b8px
2026/09/12 18:08:17 Decoded script /tekton/scripts/script-12-r6tr9

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

Showing logs for build greencapitaltrade/flash/pr-154 #2 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@3e1d079d4aadcc460b928a3b8f592cacb7488e0c 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 3e1d079d feat(iot): source device-type mapping from assetIotTypes API (closes #145)
checked out revision: refs/pull/154/head:PR-154@3e1d079d4aadcc460b928a3b8f592cacb7488e0c to dir: source

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