Showing logs for build greencapitaltrade/fury/pr-2053 #2 stage from-build-pack and container prepare 2026/06/28 18:07:19 Entrypoint initialization Showing logs for build greencapitaltrade/fury/pr-2053 #2 stage from-build-pack and container place-scripts 2026/06/28 18:07:19 Decoded script /tekton/scripts/script-0-dd4gw 2026/06/28 18:07:19 Decoded script /tekton/scripts/script-1-8ldxn 2026/06/28 18:07:19 Decoded script /tekton/scripts/script-2-2ccfq 2026/06/28 18:07:19 Decoded script /tekton/scripts/script-3-sblgb 2026/06/28 18:07:19 Decoded script /tekton/scripts/script-4-pbqjs 2026/06/28 18:07:19 Decoded script /tekton/scripts/script-5-g89pd 2026/06/28 18:07:19 Decoded script /tekton/scripts/script-6-mcqhb 2026/06/28 18:07:19 Decoded script /tekton/scripts/script-7-4tx6v 2026/06/28 18:07:20 Decoded script /tekton/scripts/script-9-plxl2 2026/06/28 18:07:20 Decoded script /tekton/scripts/script-10-s6wkn Showing logs for build greencapitaltrade/fury/pr-2053 #2 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/fury/pr-2053 #2 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/fury.git version refs/pull/2053/head:PR-2053@87ea9b3737ae755e86141c52f6d014e0bf03e750 to dir: source Cloning into 'source'... From https://github.com/greencapitaltrade/fury * [new ref] refs/pull/2053/head -> PR-2053 Switched to branch 'PR-2053' HEAD is now at 87ea9b37 chore: update repomix-output.xml checked out revision: refs/pull/2053/head:PR-2053@87ea9b3737ae755e86141c52f6d014e0bf03e750 to dir: source Showing logs for build greencapitaltrade/fury/pr-2053 #2 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:7f55f4ef217856e06ef42b865a5ff2367ef53c90,2053:87ea9b3737ae755e86141c52f6d014e0bf03e750:refs/pull/2053/head using base branch main and base sha 7f55f4ef217856e06ef42b865a5ff2367ef53c90 merging sha: 87ea9b3737ae755e86141c52f6d014e0bf03e750 error: error during merge: merging 87ea9b3737ae755e86141c52f6d014e0bf03e750 into main: failed to run 'git merge 87ea9b3737ae755e86141c52f6d014e0bf03e750' command in directory '.', output: 'Auto-merging .lighthouse/jenkins-x/pullrequest.yaml CONFLICT (content): Merge conflict in .lighthouse/jenkins-x/pullrequest.yaml Auto-merging schema.graphql Auto-merging src/schema/types.ts CONFLICT (content): Merge conflict in src/schema/types.ts Auto-merging src/utils/bifrost-client.ts CONFLICT (content): Merge conflict in src/utils/bifrost-client.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.