Showing logs for build greencapitaltrade/thor/pr-588 #1 stage from-build-pack and container prepare
2026/09/23 17:32:03 Entrypoint initialization

Showing logs for build greencapitaltrade/thor/pr-588 #1 stage from-build-pack and container place-scripts
2026/09/23 17:32:03 Decoded script /tekton/scripts/script-0-4xq82
2026/09/23 17:32:03 Decoded script /tekton/scripts/script-1-j56sw
2026/09/23 17:32:04 Decoded script /tekton/scripts/script-2-s52l6
2026/09/23 17:32:04 Decoded script /tekton/scripts/script-3-7bwt9
2026/09/23 17:32:04 Decoded script /tekton/scripts/script-4-5zv7s
2026/09/23 17:32:04 Decoded script /tekton/scripts/script-5-x5km6
2026/09/23 17:32:04 Decoded script /tekton/scripts/script-7-vx7lt
2026/09/23 17:32:04 Decoded script /tekton/scripts/script-8-fvvfs
2026/09/23 17:32:04 Decoded script /tekton/scripts/script-9-s87hf

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

Showing logs for build greencapitaltrade/thor/pr-588 #1 stage from-build-pack and container step-git-clone
git cloning url: https://github.com/greencapitaltrade/thor.git version refs/pull/588/head:PR-588@a33d68df540576460253f8d779a9b43797f59370 to dir: source
Cloning into 'source'...
From https://github.com/greencapitaltrade/thor
 * [new ref]         refs/pull/588/head -> PR-588
Switched to branch 'PR-588'
HEAD is now at a33d68d docs: correct VoltCred magic-link app host
checked out revision: refs/pull/588/head:PR-588@a33d68df540576460253f8d779a9b43797f59370 to dir: source

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