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

Showing logs for build greencapitaltrade/flash/pr-321 #2 stage from-build-pack and container place-scripts
2026/09/12 18:06:18 Decoded script /tekton/scripts/script-0-btpsd
2026/09/12 18:06:18 Decoded script /tekton/scripts/script-1-cdrtm
2026/09/12 18:06:18 Decoded script /tekton/scripts/script-2-c5nh4
2026/09/12 18:06:18 Decoded script /tekton/scripts/script-3-hnqrk
2026/09/12 18:06:18 Decoded script /tekton/scripts/script-4-f72d8
2026/09/12 18:06:18 Decoded script /tekton/scripts/script-5-7kxs6
2026/09/12 18:06:18 Decoded script /tekton/scripts/script-6-2x8vg
2026/09/12 18:06:18 Decoded script /tekton/scripts/script-7-dh4qk
2026/09/12 18:06:18 Decoded script /tekton/scripts/script-8-ttpcd
2026/09/12 18:06:18 Decoded script /tekton/scripts/script-9-fm5vv
2026/09/12 18:06:18 Decoded script /tekton/scripts/script-11-rckp2
2026/09/12 18:06:18 Decoded script /tekton/scripts/script-12-cjn4c

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

Showing logs for build greencapitaltrade/flash/pr-321 #2 stage from-build-pack and container step-git-clone
git cloning url: https://github.com/greencapitaltrade/flash.git version refs/pull/321/head:PR-321@ba4ff961cfc23a2895f40dc5bd118a2f0179f44f to dir: source
Cloning into 'source'...
From https://github.com/greencapitaltrade/flash
 * [new ref]           refs/pull/321/head -> PR-321
Switched to branch 'PR-321'
HEAD is now at ba4ff961 feat(payment-tracking): wire PaymentTrackingScreen to asset-domain payment mutations
checked out revision: refs/pull/321/head:PR-321@ba4ff961cfc23a2895f40dc5bd118a2f0179f44f to dir: source

Showing logs for build greencapitaltrade/flash/pr-321 #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,321:ba4ff961cfc23a2895f40dc5bd118a2f0179f44f:refs/pull/321/head
using base branch main and base sha 7bcb2f4c19213ebc511ba1f29b7b899b2a3c0f3b
merging sha: ba4ff961cfc23a2895f40dc5bd118a2f0179f44f
error: error during merge: merging ba4ff961cfc23a2895f40dc5bd118a2f0179f44f into main: failed to run 'git merge ba4ff961cfc23a2895f40dc5bd118a2f0179f44f' command in directory '.', output: 'Auto-merging ASSET_MANAGEMENT.md
CONFLICT (content): Merge conflict in ASSET_MANAGEMENT.md
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
Auto-merging packages/app/features/asset/types/index.ts
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.