Showing logs for build greencapitaltrade/thor/pr-549 #1 stage from-build-pack and container prepare
2026/06/19 06:44:40 Entrypoint initialization

Showing logs for build greencapitaltrade/thor/pr-549 #1 stage from-build-pack and container place-scripts
2026/06/19 06:44:43 Decoded script /tekton/scripts/script-0-jxcxn
2026/06/19 06:44:43 Decoded script /tekton/scripts/script-1-xk94z
2026/06/19 06:44:43 Decoded script /tekton/scripts/script-2-jpv6z
2026/06/19 06:44:43 Decoded script /tekton/scripts/script-3-4d7tf
2026/06/19 06:44:43 Decoded script /tekton/scripts/script-4-gfg9s
2026/06/19 06:44:43 Decoded script /tekton/scripts/script-5-nv9r8
2026/06/19 06:44:43 Decoded script /tekton/scripts/script-7-n62zg
2026/06/19 06:44:43 Decoded script /tekton/scripts/script-8-vv47z
2026/06/19 06:44:43 Decoded script /tekton/scripts/script-9-bffx6

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

Showing logs for build greencapitaltrade/thor/pr-549 #1 stage from-build-pack and container step-git-clone
git cloning url: https://github.com/greencapitaltrade/thor.git version refs/pull/549/head:PR-549@1bd365a7c584bb61dcf93ceb751d10edcf7cd798 to dir: source
Cloning into 'source'...
From https://github.com/greencapitaltrade/thor
 * [new ref]         refs/pull/549/head -> PR-549
Switched to branch 'PR-549'
HEAD is now at 1bd365a chore: fix pre-commit hook to auto-format then fail on unfixable errors
checked out revision: refs/pull/549/head:PR-549@1bd365a7c584bb61dcf93ceb751d10edcf7cd798 to dir: source

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