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

Showing logs for build greencapitaltrade/flash/pr-190 #2 stage from-build-pack and container place-scripts
2026/09/12 18:08:07 Decoded script /tekton/scripts/script-0-pm2n5
2026/09/12 18:08:07 Decoded script /tekton/scripts/script-1-57vxm
2026/09/12 18:08:07 Decoded script /tekton/scripts/script-2-kwddl
2026/09/12 18:08:08 Decoded script /tekton/scripts/script-3-zrwjb
2026/09/12 18:08:08 Decoded script /tekton/scripts/script-4-c9fb5
2026/09/12 18:08:08 Decoded script /tekton/scripts/script-5-gf4mn
2026/09/12 18:08:08 Decoded script /tekton/scripts/script-6-wrcrd
2026/09/12 18:08:08 Decoded script /tekton/scripts/script-7-bsntm
2026/09/12 18:08:08 Decoded script /tekton/scripts/script-8-6l8sf
2026/09/12 18:08:08 Decoded script /tekton/scripts/script-9-hw6kv
2026/09/12 18:08:08 Decoded script /tekton/scripts/script-11-kd66l
2026/09/12 18:08:08 Decoded script /tekton/scripts/script-12-qwd4d

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

Showing logs for build greencapitaltrade/flash/pr-190 #2 stage from-build-pack and container step-git-clone
git cloning url: https://github.com/greencapitaltrade/flash.git version refs/pull/190/head:PR-190@0b408d4f9cfbfa9c7778e95b9eaaed18b9788480 to dir: source
Cloning into 'source'...
From https://github.com/greencapitaltrade/flash
 * [new ref]           refs/pull/190/head -> PR-190
Switched to branch 'PR-190'
HEAD is now at 0b408d4f feat: migrate command UI to device-targeted executeDeviceCommand
checked out revision: refs/pull/190/head:PR-190@0b408d4f9cfbfa9c7778e95b9eaaed18b9788480 to dir: source

Showing logs for build greencapitaltrade/flash/pr-190 #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,190:0b408d4f9cfbfa9c7778e95b9eaaed18b9788480:refs/pull/190/head
using base branch main and base sha 7bcb2f4c19213ebc511ba1f29b7b899b2a3c0f3b
merging sha: 0b408d4f9cfbfa9c7778e95b9eaaed18b9788480
error: error during merge: merging 0b408d4f9cfbfa9c7778e95b9eaaed18b9788480 into main: failed to run 'git merge 0b408d4f9cfbfa9c7778e95b9eaaed18b9788480' command in directory '.', output: 'Auto-merging packages/api/src/index.ts
CONFLICT (content): Merge conflict in packages/api/src/index.ts
Auto-merging packages/app/features/asset/api/hooks.ts
Auto-merging packages/app/features/asset/api/mutations.ts
Auto-merging packages/app/features/asset/api/queries.ts
CONFLICT (content): Merge conflict in packages/app/features/asset/api/queries.ts
CONFLICT (modify/delete): packages/app/features/asset/hooks/useAssetManagerApollo.ts deleted in HEAD and modified in 0b408d4f9cfbfa9c7778e95b9eaaed18b9788480.  Version 0b408d4f9cfbfa9c7778e95b9eaaed18b9788480 of packages/app/features/asset/hooks/useAssetManagerApollo.ts left in tree.
Auto-merging packages/app/features/asset/screen.tsx
CONFLICT (content): Merge conflict in packages/app/features/asset/screen.tsx
Auto-merging packages/app/features/asset/screens/AssetSettingsScreen.tsx
Auto-merging packages/app/features/customer/commands/index.tsx
CONFLICT (content): Merge conflict in packages/app/features/customer/commands/index.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.