Showing logs for build greencapitaltrade/deadpool/pr-115 #6 stage from-build-pack and container prepare
2026/07/12 16:51:52 Entrypoint initialization

Showing logs for build greencapitaltrade/deadpool/pr-115 #6 stage from-build-pack and container place-scripts
2026/07/12 16:51:53 Decoded script /tekton/scripts/script-0-8fkk5
2026/07/12 16:51:53 Decoded script /tekton/scripts/script-1-qjwkv
2026/07/12 16:51:53 Decoded script /tekton/scripts/script-2-j2z54
2026/07/12 16:51:53 Decoded script /tekton/scripts/script-3-z978j
2026/07/12 16:51:53 Decoded script /tekton/scripts/script-4-brhfm
2026/07/12 16:51:53 Decoded script /tekton/scripts/script-6-vs5r8
2026/07/12 16:51:53 Decoded script /tekton/scripts/script-7-bsltn
2026/07/12 16:51:53 Decoded script /tekton/scripts/script-8-5px45
2026/07/12 16:51:53 Decoded script /tekton/scripts/script-9-wvhmc

Showing logs for build greencapitaltrade/deadpool/pr-115 #6 stage from-build-pack and container working-dir-initializer

Showing logs for build greencapitaltrade/deadpool/pr-115 #6 stage from-build-pack and container step-git-clone
git cloning url: https://github.com/greencapitaltrade/deadpool.git version refs/pull/115/head:PR-115@bfc0b7489467cee070f8542e867ce3e786c1b773 to dir: source
Cloning into 'source'...
From https://github.com/greencapitaltrade/deadpool
 * [new ref]         refs/pull/115/head -> PR-115
Switched to branch 'PR-115'
HEAD is now at bfc0b74 fix(preview): cap preview infra memory/cpu limits
checked out revision: refs/pull/115/head:PR-115@bfc0b7489467cee070f8542e867ce3e786c1b773 to dir: source

Showing logs for build greencapitaltrade/deadpool/pr-115 #6 stage from-build-pack and container step-git-merge
setup git user  email jenkins-x@googlegroups.com
Using SHAs from PULL_REFS=main:f3f16494b4e67a079db979c6cac83a8a1b3dd48c,115:bfc0b7489467cee070f8542e867ce3e786c1b773:refs/pull/115/head
using base branch main and base sha f3f16494b4e67a079db979c6cac83a8a1b3dd48c
merging sha: bfc0b7489467cee070f8542e867ce3e786c1b773
error: error during merge: merging bfc0b7489467cee070f8542e867ce3e786c1b773 into main: failed to run 'git merge bfc0b7489467cee070f8542e867ce3e786c1b773' command in directory '.', output: 'Auto-merging preview/helmfile.yaml.gotmpl
CONFLICT (content): Merge conflict in preview/helmfile.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.