Showing logs for build greencapitaltrade/fury/pr-2078 #2 stage from-build-pack and container prepare 2026/08/08 14:06:52 Entrypoint initialization Showing logs for build greencapitaltrade/fury/pr-2078 #2 stage from-build-pack and container place-scripts 2026/08/08 14:06:53 Decoded script /tekton/scripts/script-0-xgk42 2026/08/08 14:06:53 Decoded script /tekton/scripts/script-1-6hhmq 2026/08/08 14:06:53 Decoded script /tekton/scripts/script-2-hl9w8 2026/08/08 14:06:53 Decoded script /tekton/scripts/script-3-rs2qf 2026/08/08 14:06:53 Decoded script /tekton/scripts/script-4-stm85 2026/08/08 14:06:53 Decoded script /tekton/scripts/script-5-vmsx4 2026/08/08 14:06:53 Decoded script /tekton/scripts/script-6-5kh4n 2026/08/08 14:06:53 Decoded script /tekton/scripts/script-7-jt5lz 2026/08/08 14:06:53 Decoded script /tekton/scripts/script-9-smsgw 2026/08/08 14:06:53 Decoded script /tekton/scripts/script-10-zs2wz Showing logs for build greencapitaltrade/fury/pr-2078 #2 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/fury/pr-2078 #2 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/fury.git version refs/pull/2078/head:PR-2078@bd04ce5081f31ea77968e094bd039a1d6c62109f to dir: source Cloning into 'source'... From https://github.com/greencapitaltrade/fury * [new ref] refs/pull/2078/head -> PR-2078 Switched to branch 'PR-2078' HEAD is now at bd04ce50 fix: address PR #2078 review feedback on lockfile drift and CI checked out revision: refs/pull/2078/head:PR-2078@bd04ce5081f31ea77968e094bd039a1d6c62109f to dir: source Showing logs for build greencapitaltrade/fury/pr-2078 #2 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:1e2de706644390a5a155ad739de1eabdd107ff0c,2078:bd04ce5081f31ea77968e094bd039a1d6c62109f:refs/pull/2078/head using base branch main and base sha 1e2de706644390a5a155ad739de1eabdd107ff0c merging sha: bd04ce5081f31ea77968e094bd039a1d6c62109f error: error during merge: merging bd04ce5081f31ea77968e094bd039a1d6c62109f into main: failed to run 'git merge bd04ce5081f31ea77968e094bd039a1d6c62109f' command in directory '.', output: 'Auto-merging .lighthouse/jenkins-x/pullrequest.yaml Auto-merging schema.graphql Auto-merging src/index.ts 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.