Showing logs for build greencapitaltrade/fury/pr-2254 #8 stage from-build-pack and container prepare 2026/10/31 15:10:30 Entrypoint initialization Showing logs for build greencapitaltrade/fury/pr-2254 #8 stage from-build-pack and container place-scripts 2026/10/31 15:10:31 Decoded script /tekton/scripts/script-0-hf2wm 2026/10/31 15:10:31 Decoded script /tekton/scripts/script-1-gbjsp 2026/10/31 15:10:31 Decoded script /tekton/scripts/script-2-6f2kx 2026/10/31 15:10:31 Decoded script /tekton/scripts/script-3-96tbb 2026/10/31 15:10:31 Decoded script /tekton/scripts/script-4-4dq5m 2026/10/31 15:10:31 Decoded script /tekton/scripts/script-5-lbclf 2026/10/31 15:10:31 Decoded script /tekton/scripts/script-6-db6jz 2026/10/31 15:10:31 Decoded script /tekton/scripts/script-7-ztfh8 2026/10/31 15:10:31 Decoded script /tekton/scripts/script-9-wvnk2 2026/10/31 15:10:32 Decoded script /tekton/scripts/script-10-m9gdh Showing logs for build greencapitaltrade/fury/pr-2254 #8 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/fury/pr-2254 #8 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@2a9bbd542e7974ee847c8d9f5eab49638f1e1e80 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 2a9bbd54 refactor: reuse existing auth for native partner queries checked out revision: refs/pull/2254/head:PR-2254@2a9bbd542e7974ee847c8d9f5eab49638f1e1e80 to dir: source Showing logs for build greencapitaltrade/fury/pr-2254 #8 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:1f5465a67121022d6e37b6c7b2af959d9f92f169,2254:2a9bbd542e7974ee847c8d9f5eab49638f1e1e80:refs/pull/2254/head using base branch main and base sha 1f5465a67121022d6e37b6c7b2af959d9f92f169 merging sha: 2a9bbd542e7974ee847c8d9f5eab49638f1e1e80 error: error during merge: merging 2a9bbd542e7974ee847c8d9f5eab49638f1e1e80 into main: failed to run 'git merge 2a9bbd542e7974ee847c8d9f5eab49638f1e1e80' command in directory '.', output: 'Auto-merging ASSET_MANAGEMENT.md Auto-merging schema.graphql 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.