Showing logs for build greencapitaltrade/fury/pr-2041 #36 stage from-build-pack and container prepare
2026/06/24 15:40:06 Entrypoint initialization

Showing logs for build greencapitaltrade/fury/pr-2041 #36 stage from-build-pack and container place-scripts
2026/06/24 15:40:11 Decoded script /tekton/scripts/script-0-n696x
2026/06/24 15:40:11 Decoded script /tekton/scripts/script-1-8mffr
2026/06/24 15:40:11 Decoded script /tekton/scripts/script-2-kmncl
2026/06/24 15:40:11 Decoded script /tekton/scripts/script-3-svjfm
2026/06/24 15:40:11 Decoded script /tekton/scripts/script-4-4n8hs
2026/06/24 15:40:11 Decoded script /tekton/scripts/script-5-2sqsb
2026/06/24 15:40:11 Decoded script /tekton/scripts/script-6-n7rnv
2026/06/24 15:40:11 Decoded script /tekton/scripts/script-8-sdrgv
2026/06/24 15:40:11 Decoded script /tekton/scripts/script-9-swtbl

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

Showing logs for build greencapitaltrade/fury/pr-2041 #36 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@f95f969313ad9b6177c0d535440ab9c0749e5655 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 f95f9693 fix(credit-check): address review feedback on grounding and guard errors
checked out revision: refs/pull/2041/head:PR-2041@f95f969313ad9b6177c0d535440ab9c0749e5655 to dir: source

Showing logs for build greencapitaltrade/fury/pr-2041 #36 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:f95f969313ad9b6177c0d535440ab9c0749e5655:refs/pull/2041/head
using base branch main and base sha a773fb28bbd24d84c026c0498e38bef654023967
merging sha: f95f969313ad9b6177c0d535440ab9c0749e5655
error: error during merge: merging f95f969313ad9b6177c0d535440ab9c0749e5655 into main: failed to run 'git merge f95f969313ad9b6177c0d535440ab9c0749e5655' 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.