Showing logs for build greencapitaltrade/pepper/pr-951 #9 stage from-build-pack and container prepare
2026/06/27 10:46:27 Entrypoint initialization

Showing logs for build greencapitaltrade/pepper/pr-951 #9 stage from-build-pack and container place-scripts
2026/06/27 10:46:27 Decoded script /tekton/scripts/script-0-z5sw4
2026/06/27 10:46:27 Decoded script /tekton/scripts/script-1-h7wjd
2026/06/27 10:46:27 Decoded script /tekton/scripts/script-2-8pln9
2026/06/27 10:46:28 Decoded script /tekton/scripts/script-3-8ptsq
2026/06/27 10:46:28 Decoded script /tekton/scripts/script-4-mr8tq
2026/06/27 10:46:28 Decoded script /tekton/scripts/script-5-vmqdr
2026/06/27 10:46:28 Decoded script /tekton/scripts/script-6-bs64b
2026/06/27 10:46:28 Decoded script /tekton/scripts/script-8-fldw5
2026/06/27 10:46:28 Decoded script /tekton/scripts/script-9-8gg6m

Showing logs for build greencapitaltrade/pepper/pr-951 #9 stage from-build-pack and container working-dir-initializer

Showing logs for build greencapitaltrade/pepper/pr-951 #9 stage from-build-pack and container step-git-clone
git cloning url: https://github.com/greencapitaltrade/pepper.git version refs/pull/951/head:PR-951@8bd662327adcf18e053287a2ae432c7477937b29 to dir: source
Cloning into 'source'...
From https://github.com/greencapitaltrade/pepper
 * [new ref]               refs/pull/951/head -> PR-951
Switched to branch 'PR-951'
HEAD is now at 8bd662327a fix(preview): use ephemeral storage for kafka in preview
checked out revision: refs/pull/951/head:PR-951@8bd662327adcf18e053287a2ae432c7477937b29 to dir: source

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