Showing logs for build greencapitaltrade/fury/pr-2018 #4 stage from-build-pack and container prepare 2026/07/03 23:59:37 Entrypoint initialization Showing logs for build greencapitaltrade/fury/pr-2018 #4 stage from-build-pack and container place-scripts 2026/07/03 23:59:41 Decoded script /tekton/scripts/script-0-b5qdh 2026/07/03 23:59:41 Decoded script /tekton/scripts/script-1-s5hdr 2026/07/03 23:59:41 Decoded script /tekton/scripts/script-2-n82cj 2026/07/03 23:59:41 Decoded script /tekton/scripts/script-3-mxrvt 2026/07/03 23:59:41 Decoded script /tekton/scripts/script-4-jxgqb 2026/07/03 23:59:41 Decoded script /tekton/scripts/script-5-xdq6v 2026/07/03 23:59:41 Decoded script /tekton/scripts/script-6-bt89b 2026/07/03 23:59:41 Decoded script /tekton/scripts/script-8-whckk 2026/07/03 23:59:41 Decoded script /tekton/scripts/script-9-ct5xr Showing logs for build greencapitaltrade/fury/pr-2018 #4 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/fury/pr-2018 #4 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/fury.git version refs/pull/2018/head:PR-2018@6302e5f95abd63190962af0b679e6b878dc92c70 to dir: source Cloning into 'source'... From https://github.com/greencapitaltrade/fury * [new ref] refs/pull/2018/head -> PR-2018 Switched to branch 'PR-2018' HEAD is now at 6302e5f9 fix(ci): drop commitlint --git-log-args, matching main's working invocation checked out revision: refs/pull/2018/head:PR-2018@6302e5f95abd63190962af0b679e6b878dc92c70 to dir: source Showing logs for build greencapitaltrade/fury/pr-2018 #4 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:7f55f4ef217856e06ef42b865a5ff2367ef53c90,2018:6302e5f95abd63190962af0b679e6b878dc92c70:refs/pull/2018/head using base branch main and base sha 7f55f4ef217856e06ef42b865a5ff2367ef53c90 merging sha: 6302e5f95abd63190962af0b679e6b878dc92c70 error: error during merge: merging 6302e5f95abd63190962af0b679e6b878dc92c70 into main: failed to run 'git merge 6302e5f95abd63190962af0b679e6b878dc92c70' command in directory '.', output: 'Auto-merging .lighthouse/jenkins-x/pullrequest.yaml Auto-merging schema.graphql CONFLICT (content): Merge conflict in schema.graphql Auto-merging src/schema/documents/query.ts CONFLICT (content): Merge conflict in src/schema/documents/query.ts Auto-merging src/schema/documents/types.ts CONFLICT (content): Merge conflict in src/schema/documents/types.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.