Showing logs for build greencapitaltrade/fury/pr-2041 #35 stage from-build-pack and container prepare 2026/06/24 15:26:31 Entrypoint initialization Showing logs for build greencapitaltrade/fury/pr-2041 #35 stage from-build-pack and container place-scripts 2026/06/24 15:26:33 Decoded script /tekton/scripts/script-0-s8lxb 2026/06/24 15:26:33 Decoded script /tekton/scripts/script-1-n4ggs 2026/06/24 15:26:33 Decoded script /tekton/scripts/script-2-jsx4s 2026/06/24 15:26:33 Decoded script /tekton/scripts/script-3-7bzmn 2026/06/24 15:26:33 Decoded script /tekton/scripts/script-4-t4knq 2026/06/24 15:26:33 Decoded script /tekton/scripts/script-5-577fw 2026/06/24 15:26:33 Decoded script /tekton/scripts/script-6-6xc8b 2026/06/24 15:26:33 Decoded script /tekton/scripts/script-8-jlg62 2026/06/24 15:26:33 Decoded script /tekton/scripts/script-9-j5b69 Showing logs for build greencapitaltrade/fury/pr-2041 #35 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/fury/pr-2041 #35 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@70a64d79c9fb4c1ba0fed8c7e4bd0fef79ef20a1 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 70a64d79 fix(credit-check): send camelCase body to match Destiny's deployed route checked out revision: refs/pull/2041/head:PR-2041@70a64d79c9fb4c1ba0fed8c7e4bd0fef79ef20a1 to dir: source Showing logs for build greencapitaltrade/fury/pr-2041 #35 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:70a64d79c9fb4c1ba0fed8c7e4bd0fef79ef20a1:refs/pull/2041/head using base branch main and base sha a773fb28bbd24d84c026c0498e38bef654023967 merging sha: 70a64d79c9fb4c1ba0fed8c7e4bd0fef79ef20a1 error: error during merge: merging 70a64d79c9fb4c1ba0fed8c7e4bd0fef79ef20a1 into main: failed to run 'git merge 70a64d79c9fb4c1ba0fed8c7e4bd0fef79ef20a1' 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.