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

Showing logs for build greencapitaltrade/flash/pr-321 #3 stage from-build-pack and container place-scripts
2026/09/12 19:26:12 Decoded script /tekton/scripts/script-0-v4wxn
2026/09/12 19:26:12 Decoded script /tekton/scripts/script-1-qrhbr
2026/09/12 19:26:12 Decoded script /tekton/scripts/script-2-bjjmf
2026/09/12 19:26:12 Decoded script /tekton/scripts/script-3-4lns6
2026/09/12 19:26:12 Decoded script /tekton/scripts/script-4-7bbcb
2026/09/12 19:26:12 Decoded script /tekton/scripts/script-5-xrcdf
2026/09/12 19:26:12 Decoded script /tekton/scripts/script-6-psmv9
2026/09/12 19:26:12 Decoded script /tekton/scripts/script-7-8vdpd
2026/09/12 19:26:12 Decoded script /tekton/scripts/script-8-llkg6
2026/09/12 19:26:12 Decoded script /tekton/scripts/script-9-bkbdx
2026/09/12 19:26:12 Decoded script /tekton/scripts/script-11-5f7fg
2026/09/12 19:26:12 Decoded script /tekton/scripts/script-12-rsj4p

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

Showing logs for build greencapitaltrade/flash/pr-321 #3 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@64d393207bcdfa7cf7bc3e6ca9754ebd2e9f35f5 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 64d39320 feat(payment-tracking): wire PaymentTrackingScreen to asset-domain payment mutations
checked out revision: refs/pull/321/head:PR-321@64d393207bcdfa7cf7bc3e6ca9754ebd2e9f35f5 to dir: source

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