Showing logs for build greencapitaltrade/thor/pr-555 #2 stage from-build-pack and container prepare
2026/09/18 07:06:14 Entrypoint initialization

Showing logs for build greencapitaltrade/thor/pr-555 #2 stage from-build-pack and container place-scripts
2026/09/18 07:06:15 Decoded script /tekton/scripts/script-0-tsr6q
2026/09/18 07:06:15 Decoded script /tekton/scripts/script-1-f8gzl
2026/09/18 07:06:15 Decoded script /tekton/scripts/script-2-p9rtd
2026/09/18 07:06:15 Decoded script /tekton/scripts/script-3-ffbhl
2026/09/18 07:06:15 Decoded script /tekton/scripts/script-4-j2jk8
2026/09/18 07:06:15 Decoded script /tekton/scripts/script-5-kptrz
2026/09/18 07:06:15 Decoded script /tekton/scripts/script-6-nrzm9
2026/09/18 07:06:15 Decoded script /tekton/scripts/script-8-f9rjb
2026/09/18 07:06:15 Decoded script /tekton/scripts/script-9-4l4vn
2026/09/18 07:06:15 Decoded script /tekton/scripts/script-10-6nxlc

Showing logs for build greencapitaltrade/thor/pr-555 #2 stage from-build-pack and container working-dir-initializer

Showing logs for build greencapitaltrade/thor/pr-555 #2 stage from-build-pack and container step-git-clone
git cloning url: https://github.com/greencapitaltrade/thor.git version refs/pull/555/head:PR-555@e84ad9ba40608f9c5d873d1593545b83a523d999 to dir: source
Cloning into 'source'...
From https://github.com/greencapitaltrade/thor
 * [new ref]         refs/pull/555/head -> PR-555
Switched to branch 'PR-555'
HEAD is now at e84ad9b fix: drop out-of-scope resolveKafkaClientRack call from index.js
checked out revision: refs/pull/555/head:PR-555@e84ad9ba40608f9c5d873d1593545b83a523d999 to dir: source

Showing logs for build greencapitaltrade/thor/pr-555 #2 stage from-build-pack and container step-git-merge
setup git user  email jenkins-x@googlegroups.com
Using SHAs from PULL_REFS=main:788d40a4fd5bae4f603f1f905a90acca20a0ac20,555:e84ad9ba40608f9c5d873d1593545b83a523d999:refs/pull/555/head
using base branch main and base sha 788d40a4fd5bae4f603f1f905a90acca20a0ac20
merging sha: e84ad9ba40608f9c5d873d1593545b83a523d999
error: error during merge: merging e84ad9ba40608f9c5d873d1593545b83a523d999 into main: failed to run 'git merge e84ad9ba40608f9c5d873d1593545b83a523d999' command in directory '.', output: 'Auto-merging package-lock.json
CONFLICT (content): Merge conflict in package-lock.json
Auto-merging package.json
CONFLICT (content): Merge conflict in package.json
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.