Showing logs for build greencapitaltrade/destiny/pr-1297 #3 stage from-build-pack and container prepare 2026/07/10 20:46:26 Entrypoint initialization Showing logs for build greencapitaltrade/destiny/pr-1297 #3 stage from-build-pack and container place-scripts 2026/07/10 20:46:27 Decoded script /tekton/scripts/script-0-k7dhj 2026/07/10 20:46:27 Decoded script /tekton/scripts/script-1-cjkms 2026/07/10 20:46:27 Decoded script /tekton/scripts/script-2-fpchr 2026/07/10 20:46:27 Decoded script /tekton/scripts/script-3-h9tl2 2026/07/10 20:46:27 Decoded script /tekton/scripts/script-4-tsn65 2026/07/10 20:46:27 Decoded script /tekton/scripts/script-5-9t22l 2026/07/10 20:46:27 Decoded script /tekton/scripts/script-6-2xfft 2026/07/10 20:46:27 Decoded script /tekton/scripts/script-7-l67jx 2026/07/10 20:46:27 Decoded script /tekton/scripts/script-8-rhwvk 2026/07/10 20:46:27 Decoded script /tekton/scripts/script-9-xxspb Showing logs for build greencapitaltrade/destiny/pr-1297 #3 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/destiny/pr-1297 #3 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/destiny.git version refs/pull/1297/head:PR-1297@5b997453ce862d23fa60ec7c29714238df9c89c2 to dir: source Cloning into 'source'... From https://github.com/greencapitaltrade/destiny * [new ref] refs/pull/1297/head -> PR-1297 Switched to branch 'PR-1297' HEAD is now at 5b997453 chore(preview): prefer spot pool for preview app pod checked out revision: refs/pull/1297/head:PR-1297@5b997453ce862d23fa60ec7c29714238df9c89c2 to dir: source Showing logs for build greencapitaltrade/destiny/pr-1297 #3 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:c0dbb17effe752a0798c85d39162bd1fd3ed9604,1297:5b997453ce862d23fa60ec7c29714238df9c89c2:refs/pull/1297/head using base branch main and base sha c0dbb17effe752a0798c85d39162bd1fd3ed9604 merging sha: 5b997453ce862d23fa60ec7c29714238df9c89c2 error: error during merge: merging 5b997453ce862d23fa60ec7c29714238df9c89c2 into main: failed to run 'git merge 5b997453ce862d23fa60ec7c29714238df9c89c2' command in directory '.', output: 'Auto-merging preview/values.yaml.gotmpl CONFLICT (content): Merge conflict in preview/values.yaml.gotmpl 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.