Showing logs for build greencapitaltrade/fury/pr-2041 #34 stage from-build-pack and container prepare 2026/06/24 15:04:17 Entrypoint initialization Showing logs for build greencapitaltrade/fury/pr-2041 #34 stage from-build-pack and container place-scripts 2026/06/24 15:04:17 Decoded script /tekton/scripts/script-0-7xscc 2026/06/24 15:04:17 Decoded script /tekton/scripts/script-1-lth5v 2026/06/24 15:04:17 Decoded script /tekton/scripts/script-2-wm7vk 2026/06/24 15:04:17 Decoded script /tekton/scripts/script-3-4mscq 2026/06/24 15:04:17 Decoded script /tekton/scripts/script-4-dpdv6 2026/06/24 15:04:17 Decoded script /tekton/scripts/script-5-sd4td 2026/06/24 15:04:17 Decoded script /tekton/scripts/script-6-nl9cf 2026/06/24 15:04:17 Decoded script /tekton/scripts/script-8-ptsmh 2026/06/24 15:04:17 Decoded script /tekton/scripts/script-9-vcsrn Showing logs for build greencapitaltrade/fury/pr-2041 #34 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/fury/pr-2041 #34 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/fury.git version refs/pull/2041/head:PR-2041@48f21eed7d2f969c1313232960dcf741ad78d92f to dir: source Cloning into 'source'... From https://github.com/greencapitaltrade/fury * [new ref] refs/pull/2041/head -> PR-2041 Switched to branch 'PR-2041' HEAD is now at 48f21eed fix(credit-check): send snake_case body per PRD and tighten type comparison checked out revision: refs/pull/2041/head:PR-2041@48f21eed7d2f969c1313232960dcf741ad78d92f to dir: source Showing logs for build greencapitaltrade/fury/pr-2041 #34 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:a773fb28bbd24d84c026c0498e38bef654023967,2041:48f21eed7d2f969c1313232960dcf741ad78d92f:refs/pull/2041/head using base branch main and base sha a773fb28bbd24d84c026c0498e38bef654023967 merging sha: 48f21eed7d2f969c1313232960dcf741ad78d92f error: error during merge: merging 48f21eed7d2f969c1313232960dcf741ad78d92f into main: failed to run 'git merge 48f21eed7d2f969c1313232960dcf741ad78d92f' command in directory '.', output: 'Auto-merging schema.graphql CONFLICT (content): Merge conflict in schema.graphql Auto-merging src/schema/index.ts CONFLICT (content): Merge conflict in src/schema/index.ts Auto-merging 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.