Showing logs for build greencapitaltrade/fury/pr-2065 #3 stage from-build-pack and container prepare 2026/06/24 09:59:46 Entrypoint initialization Showing logs for build greencapitaltrade/fury/pr-2065 #3 stage from-build-pack and container place-scripts 2026/06/24 09:59:54 Decoded script /tekton/scripts/script-0-9xvpl 2026/06/24 09:59:54 Decoded script /tekton/scripts/script-1-bcgf5 2026/06/24 09:59:54 Decoded script /tekton/scripts/script-2-scwtw 2026/06/24 09:59:54 Decoded script /tekton/scripts/script-3-f7fxd 2026/06/24 09:59:54 Decoded script /tekton/scripts/script-4-5wq5l 2026/06/24 09:59:54 Decoded script /tekton/scripts/script-5-rcpt4 2026/06/24 09:59:54 Decoded script /tekton/scripts/script-6-npgr9 2026/06/24 09:59:55 Decoded script /tekton/scripts/script-8-ppsjp 2026/06/24 09:59:55 Decoded script /tekton/scripts/script-9-5k2rr Showing logs for build greencapitaltrade/fury/pr-2065 #3 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/fury/pr-2065 #3 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/fury.git version refs/pull/2065/head:PR-2065@7e3a15c9458a76cef905fc35022d352b0b13e95d to dir: source Cloning into 'source'... From https://github.com/greencapitaltrade/fury * [new ref] refs/pull/2065/head -> PR-2065 Switched to branch 'PR-2065' HEAD is now at 7e3a15c9 fix: require application_id in executeFlowStep and drop current_application middleware checked out revision: refs/pull/2065/head:PR-2065@7e3a15c9458a76cef905fc35022d352b0b13e95d to dir: source Showing logs for build greencapitaltrade/fury/pr-2065 #3 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:282bab365182abe1739e3f304dc95f256b423bd0,2065:7e3a15c9458a76cef905fc35022d352b0b13e95d:refs/pull/2065/head using base branch main and base sha 282bab365182abe1739e3f304dc95f256b423bd0 merging sha: 7e3a15c9458a76cef905fc35022d352b0b13e95d error: error during merge: merging 7e3a15c9458a76cef905fc35022d352b0b13e95d into main: failed to run 'git merge 7e3a15c9458a76cef905fc35022d352b0b13e95d' command in directory '.', output: 'Auto-merging src/schema/documents/mutation.ts CONFLICT (content): Merge conflict in src/schema/documents/mutation.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.