Showing logs for build greencapitaltrade/destiny/pr-1159 #6 stage from-build-pack and container prepare 2026/06/14 09:06:40 Entrypoint initialization Showing logs for build greencapitaltrade/destiny/pr-1159 #6 stage from-build-pack and container place-scripts 2026/06/14 09:06:40 Decoded script /tekton/scripts/script-0-5qvjf 2026/06/14 09:06:40 Decoded script /tekton/scripts/script-1-gpzfj 2026/06/14 09:06:40 Decoded script /tekton/scripts/script-2-8r4wz 2026/06/14 09:06:40 Decoded script /tekton/scripts/script-3-9cjsg 2026/06/14 09:06:40 Decoded script /tekton/scripts/script-4-v4v77 2026/06/14 09:06:40 Decoded script /tekton/scripts/script-5-lmzz8 2026/06/14 09:06:40 Decoded script /tekton/scripts/script-6-wwxsk 2026/06/14 09:06:40 Decoded script /tekton/scripts/script-7-qn8dk 2026/06/14 09:06:40 Decoded script /tekton/scripts/script-8-p4qcw Showing logs for build greencapitaltrade/destiny/pr-1159 #6 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/destiny/pr-1159 #6 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/destiny.git version refs/pull/1159/head:PR-1159@27dc9d686d0e775ab0b1a9bdf8bbd79ce4c9eb9a to dir: source Cloning into 'source'... Updating files: 85% (368/430) Updating files: 86% (370/430) Updating files: 87% (375/430) Updating files: 88% (379/430) Updating files: 89% (383/430) Updating files: 90% (387/430) Updating files: 91% (392/430) Updating files: 92% (396/430) Updating files: 93% (400/430) Updating files: 94% (405/430) Updating files: 95% (409/430) Updating files: 96% (413/430) Updating files: 97% (418/430) Updating files: 98% (422/430) Updating files: 99% (426/430) Updating files: 100% (430/430) Updating files: 100% (430/430), done. From https://github.com/greencapitaltrade/destiny * [new ref] refs/pull/1159/head -> PR-1159 Switched to branch 'PR-1159' HEAD is now at 27dc9d68 fix(preview): supply DESTINY_ENCRYPTION_KEY via applicationConfig checked out revision: refs/pull/1159/head:PR-1159@27dc9d686d0e775ab0b1a9bdf8bbd79ce4c9eb9a to dir: source Showing logs for build greencapitaltrade/destiny/pr-1159 #6 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:0e55601f1073de1604fccd54edc0eafa72838e9e,1159:27dc9d686d0e775ab0b1a9bdf8bbd79ce4c9eb9a:refs/pull/1159/head using base branch main and base sha 0e55601f1073de1604fccd54edc0eafa72838e9e merging sha: 27dc9d686d0e775ab0b1a9bdf8bbd79ce4c9eb9a error: error during merge: merging 27dc9d686d0e775ab0b1a9bdf8bbd79ce4c9eb9a into main: failed to run 'git merge 27dc9d686d0e775ab0b1a9bdf8bbd79ce4c9eb9a' 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.