Showing logs for build greencapitaltrade/jarvis/pr-32 #3 stage from-build-pack and container prepare
2026/06/21 18:59:36 Entrypoint initialization

Showing logs for build greencapitaltrade/jarvis/pr-32 #3 stage from-build-pack and container place-scripts
2026/06/21 18:59:36 Decoded script /tekton/scripts/script-0-62snx
2026/06/21 18:59:36 Decoded script /tekton/scripts/script-1-m9rwl
2026/06/21 18:59:36 Decoded script /tekton/scripts/script-2-bw9cg
2026/06/21 18:59:36 Decoded script /tekton/scripts/script-3-478vw

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

Showing logs for build greencapitaltrade/jarvis/pr-32 #3 stage from-build-pack and container step-git-clone
git cloning url: https://github.com/greencapitaltrade/jarvis.git version refs/pull/32/head:PR-32@79b5f0654461178f0b466a6c3bf98831f1e3eda4 to dir: source
Cloning into 'source'...
From https://github.com/greencapitaltrade/jarvis
 * [new ref]         refs/pull/32/head -> PR-32
Switched to branch 'PR-32'
HEAD is now at 79b5f06 ci(jarvis): install jq in the PR pipeline (pg_* bats tests pipe to jq)
checked out revision: refs/pull/32/head:PR-32@79b5f0654461178f0b466a6c3bf98831f1e3eda4 to dir: source

Showing logs for build greencapitaltrade/jarvis/pr-32 #3 stage from-build-pack and container step-git-merge
setup git user  email jenkins-x@googlegroups.com
Using SHAs from PULL_REFS=main:9addca860e3fb4e33a7f54af01dfdcc5070a37a2,32:79b5f0654461178f0b466a6c3bf98831f1e3eda4:refs/pull/32/head
using base branch main and base sha 9addca860e3fb4e33a7f54af01dfdcc5070a37a2
merging sha: 79b5f0654461178f0b466a6c3bf98831f1e3eda4
error: error during merge: merging 79b5f0654461178f0b466a6c3bf98831f1e3eda4 into main: failed to run 'git merge 79b5f0654461178f0b466a6c3bf98831f1e3eda4' command in directory '.', output: 'Auto-merging .lighthouse/jenkins-x/pullrequest.yaml
CONFLICT (add/add): Merge conflict in .lighthouse/jenkins-x/pullrequest.yaml
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.