Showing logs for build greencapitaltrade/jarvis/pr-192 #10 stage from-build-pack and container prepare
2026/07/11 06:59:28 Entrypoint initialization

Showing logs for build greencapitaltrade/jarvis/pr-192 #10 stage from-build-pack and container place-scripts
2026/07/11 06:59:29 Decoded script /tekton/scripts/script-0-6bqvg
2026/07/11 06:59:29 Decoded script /tekton/scripts/script-1-p2m8r
2026/07/11 06:59:29 Decoded script /tekton/scripts/script-2-h6z7h
2026/07/11 06:59:29 Decoded script /tekton/scripts/script-3-4rq2m
2026/07/11 06:59:29 Decoded script /tekton/scripts/script-4-5lphd
2026/07/11 06:59:29 Decoded script /tekton/scripts/script-5-b7gz9

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

Showing logs for build greencapitaltrade/jarvis/pr-192 #10 stage from-build-pack and container step-git-clone
git cloning url: https://github.com/greencapitaltrade/jarvis.git version refs/pull/192/head:PR-192@f3c3369ee89744eb134c385b411f63b618a28908 to dir: source
Cloning into 'source'...
From https://github.com/greencapitaltrade/jarvis
 * [new ref]         refs/pull/192/head -> PR-192
Switched to branch 'PR-192'
HEAD is now at f3c3369 fix(jarvis): clear stale jarvis:working label on GitHub during route retry
checked out revision: refs/pull/192/head:PR-192@f3c3369ee89744eb134c385b411f63b618a28908 to dir: source

Showing logs for build greencapitaltrade/jarvis/pr-192 #10 stage from-build-pack and container step-git-merge
setup git user  email jenkins-x@googlegroups.com
Using SHAs from PULL_REFS=main:668706f55775c1638da9a04653ddff72c398dabd,192:f3c3369ee89744eb134c385b411f63b618a28908:refs/pull/192/head
using base branch main and base sha 668706f55775c1638da9a04653ddff72c398dabd
merging sha: f3c3369ee89744eb134c385b411f63b618a28908
error: error during merge: merging f3c3369ee89744eb134c385b411f63b618a28908 into main: failed to run 'git merge f3c3369ee89744eb134c385b411f63b618a28908' command in directory '.', output: 'Auto-merging bin/jarvis_lib/queue.py
CONFLICT (content): Merge conflict in bin/jarvis_lib/queue.py
Auto-merging bin/jarvis_lib/ratelimit.py
CONFLICT (content): Merge conflict in bin/jarvis_lib/ratelimit.py
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.