Showing logs for build greencapitaltrade/fury/pr-2254 #1 stage from-build-pack and container prepare
2026/11/03 12:49:40 Entrypoint initialization

Showing logs for build greencapitaltrade/fury/pr-2254 #1 stage from-build-pack and container place-scripts
2026/11/03 12:49:42 Decoded script /tekton/scripts/script-0-fx8c8
2026/11/03 12:49:42 Decoded script /tekton/scripts/script-1-28b7n
2026/11/03 12:49:42 Decoded script /tekton/scripts/script-2-bs768
2026/11/03 12:49:42 Decoded script /tekton/scripts/script-3-dd9sr
2026/11/03 12:49:42 Decoded script /tekton/scripts/script-4-9fghs
2026/11/03 12:49:42 Decoded script /tekton/scripts/script-5-fj9xf
2026/11/03 12:49:42 Decoded script /tekton/scripts/script-6-hm6nn
2026/11/03 12:49:42 Decoded script /tekton/scripts/script-7-7x8nr
2026/11/03 12:49:42 Decoded script /tekton/scripts/script-9-h98dz
2026/11/03 12:49:42 Decoded script /tekton/scripts/script-10-sxtsr

Showing logs for build greencapitaltrade/fury/pr-2254 #1 stage from-build-pack and container working-dir-initializer

Showing logs for build greencapitaltrade/fury/pr-2254 #1 stage from-build-pack and container step-git-clone
git cloning url: https://github.com/greencapitaltrade/fury.git version refs/pull/2254/head:PR-2254@b8a001d62952f67e9aa2a811096c1f55dc008664 to dir: source
Cloning into 'source'...
From https://github.com/greencapitaltrade/fury
 * [new ref]           refs/pull/2254/head -> PR-2254
Switched to branch 'PR-2254'
HEAD is now at b8a001d6 fix: align partner requests with shared onboarding records
checked out revision: refs/pull/2254/head:PR-2254@b8a001d62952f67e9aa2a811096c1f55dc008664 to dir: source

Showing logs for build greencapitaltrade/fury/pr-2254 #1 stage from-build-pack and container step-git-merge
setup git user  email jenkins-x@googlegroups.com
Using SHAs from PULL_REFS=main:bcfa8cbfea0848500e934a232c5037d0cda9acd5,2254:b8a001d62952f67e9aa2a811096c1f55dc008664:refs/pull/2254/head
using base branch main and base sha bcfa8cbfea0848500e934a232c5037d0cda9acd5
merging sha: b8a001d62952f67e9aa2a811096c1f55dc008664
error: error during merge: merging b8a001d62952f67e9aa2a811096c1f55dc008664 into main: failed to run 'git merge b8a001d62952f67e9aa2a811096c1f55dc008664' command in directory '.', output: 'Auto-merging ASSET_MANAGEMENT.md
CONFLICT (content): Merge conflict in ASSET_MANAGEMENT.md
Auto-merging schema.graphql
CONFLICT (content): Merge conflict in schema.graphql
Auto-merging src/schema/index.ts
Auto-merging src/schema/types.ts
CONFLICT (content): Merge conflict in src/schema/types.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.