Showing logs for build greencapitaltrade/fury/pr-2048 #2 stage from-build-pack and container prepare 2026/08/08 14:01:06 Entrypoint initialization Showing logs for build greencapitaltrade/fury/pr-2048 #2 stage from-build-pack and container place-scripts 2026/08/08 14:01:08 Decoded script /tekton/scripts/script-0-jgk9w 2026/08/08 14:01:08 Decoded script /tekton/scripts/script-1-dcf7s 2026/08/08 14:01:08 Decoded script /tekton/scripts/script-2-kx8zv 2026/08/08 14:01:08 Decoded script /tekton/scripts/script-3-6qrjt 2026/08/08 14:01:08 Decoded script /tekton/scripts/script-4-l2ck2 2026/08/08 14:01:08 Decoded script /tekton/scripts/script-5-87qst 2026/08/08 14:01:08 Decoded script /tekton/scripts/script-6-8rsvz 2026/08/08 14:01:08 Decoded script /tekton/scripts/script-8-6hjgw 2026/08/08 14:01:08 Decoded script /tekton/scripts/script-9-jdmrl Showing logs for build greencapitaltrade/fury/pr-2048 #2 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/fury/pr-2048 #2 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/fury.git version refs/pull/2048/head:PR-2048@6e99fecc1e926455f950a7bfa8569454b3035733 to dir: source Cloning into 'source'... From https://github.com/greencapitaltrade/fury * [new ref] refs/pull/2048/head -> PR-2048 Switched to branch 'PR-2048' HEAD is now at 6e99fecc Merge branch 'jarvis/feature-2017' into jarvis/issue-2045 checked out revision: refs/pull/2048/head:PR-2048@6e99fecc1e926455f950a7bfa8569454b3035733 to dir: source Showing logs for build greencapitaltrade/fury/pr-2048 #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,2048:6e99fecc1e926455f950a7bfa8569454b3035733:refs/pull/2048/head using base branch main and base sha 1e2de706644390a5a155ad739de1eabdd107ff0c merging sha: 6e99fecc1e926455f950a7bfa8569454b3035733 error: error during merge: merging 6e99fecc1e926455f950a7bfa8569454b3035733 into main: failed to run 'git merge 6e99fecc1e926455f950a7bfa8569454b3035733' command in directory '.', output: 'Auto-merging .lighthouse/jenkins-x/pullrequest.yaml CONFLICT (content): Merge conflict in .lighthouse/jenkins-x/pullrequest.yaml 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.