Showing logs for build greencapitaltrade/destiny/pr-1159 #5 stage from-build-pack and container prepare 2026/06/14 08:58:38 Entrypoint initialization Showing logs for build greencapitaltrade/destiny/pr-1159 #5 stage from-build-pack and container place-scripts 2026/06/14 08:58:39 Decoded script /tekton/scripts/script-0-hrkfl 2026/06/14 08:58:39 Decoded script /tekton/scripts/script-1-dxxgm 2026/06/14 08:58:39 Decoded script /tekton/scripts/script-2-542zh 2026/06/14 08:58:39 Decoded script /tekton/scripts/script-3-6v4m2 2026/06/14 08:58:39 Decoded script /tekton/scripts/script-4-xbq2b 2026/06/14 08:58:39 Decoded script /tekton/scripts/script-5-78zng 2026/06/14 08:58:39 Decoded script /tekton/scripts/script-6-l4jmb 2026/06/14 08:58:39 Decoded script /tekton/scripts/script-7-fgpwj 2026/06/14 08:58:39 Decoded script /tekton/scripts/script-8-zzv9z Showing logs for build greencapitaltrade/destiny/pr-1159 #5 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/destiny/pr-1159 #5 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@5c531c3269feee21951c076553a4cb93ca127d63 to dir: source Cloning into 'source'... From https://github.com/greencapitaltrade/destiny * [new ref] refs/pull/1159/head -> PR-1159 Switched to branch 'PR-1159' HEAD is now at 5c531c32 fix(preview): supply DESTINY_ENCRYPTION_KEY via applicationConfig checked out revision: refs/pull/1159/head:PR-1159@5c531c3269feee21951c076553a4cb93ca127d63 to dir: source Showing logs for build greencapitaltrade/destiny/pr-1159 #5 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:5c531c3269feee21951c076553a4cb93ca127d63:refs/pull/1159/head using base branch main and base sha 0e55601f1073de1604fccd54edc0eafa72838e9e merging sha: 5c531c3269feee21951c076553a4cb93ca127d63 error: error during merge: merging 5c531c3269feee21951c076553a4cb93ca127d63 into main: failed to run 'git merge 5c531c3269feee21951c076553a4cb93ca127d63' 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.