Showing logs for build greencapitaltrade/jarvis/pr-81 #1 stage from-build-pack and container prepare
2026/06/27 20:17:13 Entrypoint initialization

Showing logs for build greencapitaltrade/jarvis/pr-81 #1 stage from-build-pack and container place-scripts
2026/06/27 20:17:15 Decoded script /tekton/scripts/script-0-l8qp2
2026/06/27 20:17:15 Decoded script /tekton/scripts/script-1-jbp78
2026/06/27 20:17:15 Decoded script /tekton/scripts/script-2-dp72g
2026/06/27 20:17:15 Decoded script /tekton/scripts/script-3-kb5pc

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

Showing logs for build greencapitaltrade/jarvis/pr-81 #1 stage from-build-pack and container step-git-clone
git cloning url: https://github.com/greencapitaltrade/jarvis.git version refs/pull/81/head:PR-81@4f1850a7505d16e543b07c0c23a38e2bb205c9a3 to dir: source
Cloning into 'source'...
From https://github.com/greencapitaltrade/jarvis
 * [new ref]         refs/pull/81/head -> PR-81
Switched to branch 'PR-81'
HEAD is now at 4f1850a Merge pull request #94 from greencapitaltrade/jarvis/issue-84
checked out revision: refs/pull/81/head:PR-81@4f1850a7505d16e543b07c0c23a38e2bb205c9a3 to dir: source

Showing logs for build greencapitaltrade/jarvis/pr-81 #1 stage from-build-pack and container step-git-merge
setup git user  email jenkins-x@googlegroups.com
Using SHAs from PULL_REFS=main:26e90900576fbca6ae6d8163e9a06c084c4756ef,81:4f1850a7505d16e543b07c0c23a38e2bb205c9a3:refs/pull/81/head
using base branch main and base sha 26e90900576fbca6ae6d8163e9a06c084c4756ef
merging sha: 4f1850a7505d16e543b07c0c23a38e2bb205c9a3
error: error during merge: merging 4f1850a7505d16e543b07c0c23a38e2bb205c9a3 into main: failed to run 'git merge 4f1850a7505d16e543b07c0c23a38e2bb205c9a3' command in directory '.', output: 'Auto-merging .lighthouse/jenkins-x/pullrequest.yaml
Auto-merging bin/jarvis_daemon.py
CONFLICT (content): Merge conflict in bin/jarvis_daemon.py
Auto-merging bin/lib.sh
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.