Showing logs for build greencapitaltrade/destiny/pr-1088 #19 stage from-build-pack and container prepare 2026/04/20 13:19:32 Entrypoint initialization Showing logs for build greencapitaltrade/destiny/pr-1088 #19 stage from-build-pack and container place-scripts 2026/04/20 13:19:32 Decoded script /tekton/scripts/script-0-gvdlr 2026/04/20 13:19:32 Decoded script /tekton/scripts/script-1-76crc 2026/04/20 13:19:32 Decoded script /tekton/scripts/script-2-zlnbk 2026/04/20 13:19:32 Decoded script /tekton/scripts/script-3-xkzt4 2026/04/20 13:19:32 Decoded script /tekton/scripts/script-4-5wvlj 2026/04/20 13:19:32 Decoded script /tekton/scripts/script-5-kqzxs 2026/04/20 13:19:32 Decoded script /tekton/scripts/script-6-bgb8p 2026/04/20 13:19:32 Decoded script /tekton/scripts/script-7-tjtxs 2026/04/20 13:19:32 Decoded script /tekton/scripts/script-8-g7nmb Showing logs for build greencapitaltrade/destiny/pr-1088 #19 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/destiny/pr-1088 #19 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/destiny.git version refs/pull/1088/head:PR-1088@c4f57022ef688380626acec49e223b1280b9ccd8 to dir: source Cloning into 'source'... From https://github.com/greencapitaltrade/destiny * [new ref] refs/pull/1088/head -> PR-1088 Switched to branch 'PR-1088' HEAD is now at c4f57022 chore: ephemeral redis + postgres for preview, remove rabbit checked out revision: refs/pull/1088/head:PR-1088@c4f57022ef688380626acec49e223b1280b9ccd8 to dir: source Showing logs for build greencapitaltrade/destiny/pr-1088 #19 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:b76f81b32a9524c7eeb76681b85b8caec1984c25,1088:c4f57022ef688380626acec49e223b1280b9ccd8:refs/pull/1088/head using base branch main and base sha b76f81b32a9524c7eeb76681b85b8caec1984c25 merging sha: c4f57022ef688380626acec49e223b1280b9ccd8 error: error during merge: merging c4f57022ef688380626acec49e223b1280b9ccd8 into main: failed to run 'git merge c4f57022ef688380626acec49e223b1280b9ccd8' command in directory '.', output: 'Auto-merging preview/helmfile.yaml.gotmpl CONFLICT (content): Merge conflict in preview/helmfile.yaml.gotmpl Auto-merging 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.