Showing logs for build greencapitaltrade/destiny/pr-1159 #8 stage from-build-pack and container prepare
2026/06/14 23:20:21 Entrypoint initialization

Showing logs for build greencapitaltrade/destiny/pr-1159 #8 stage from-build-pack and container place-scripts
2026/06/14 23:20:22 Decoded script /tekton/scripts/script-0-b7qkv
2026/06/14 23:20:22 Decoded script /tekton/scripts/script-1-ts5db
2026/06/14 23:20:22 Decoded script /tekton/scripts/script-2-p8bjj
2026/06/14 23:20:22 Decoded script /tekton/scripts/script-3-bv7x2
2026/06/14 23:20:22 Decoded script /tekton/scripts/script-4-pnbkn
2026/06/14 23:20:22 Decoded script /tekton/scripts/script-5-hd6q4
2026/06/14 23:20:22 Decoded script /tekton/scripts/script-6-qznt4
2026/06/14 23:20:22 Decoded script /tekton/scripts/script-7-khhdq
2026/06/14 23:20:22 Decoded script /tekton/scripts/script-8-ccz59

Showing logs for build greencapitaltrade/destiny/pr-1159 #8 stage from-build-pack and container working-dir-initializer

Showing logs for build greencapitaltrade/destiny/pr-1159 #8 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@6bae86fcce69333b846c5425050dc1373c6a7bf9 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 6bae86fc fix(products): proxy to Ironman API for product catalog
checked out revision: refs/pull/1159/head:PR-1159@6bae86fcce69333b846c5425050dc1373c6a7bf9 to dir: source

Showing logs for build greencapitaltrade/destiny/pr-1159 #8 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:6bae86fcce69333b846c5425050dc1373c6a7bf9:refs/pull/1159/head
using base branch main and base sha 0e55601f1073de1604fccd54edc0eafa72838e9e
merging sha: 6bae86fcce69333b846c5425050dc1373c6a7bf9
error: error during merge: merging 6bae86fcce69333b846c5425050dc1373c6a7bf9 into main: failed to run 'git merge 6bae86fcce69333b846c5425050dc1373c6a7bf9' 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.