Showing logs for build greencapitaltrade/jarvis/pr-99 #2 stage from-build-pack and container prepare 2026/06/27 20:12:54 Entrypoint initialization Showing logs for build greencapitaltrade/jarvis/pr-99 #2 stage from-build-pack and container place-scripts 2026/06/27 20:13:03 Decoded script /tekton/scripts/script-0-7pttm 2026/06/27 20:13:03 Decoded script /tekton/scripts/script-1-gjwcj 2026/06/27 20:13:03 Decoded script /tekton/scripts/script-2-kt9dq 2026/06/27 20:13:03 Decoded script /tekton/scripts/script-3-nsn74 Showing logs for build greencapitaltrade/jarvis/pr-99 #2 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/jarvis/pr-99 #2 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/jarvis.git version refs/pull/99/head:PR-99@c224937c9f66350b12660e1443916a3d2902cbe7 to dir: source Cloning into 'source'... From https://github.com/greencapitaltrade/jarvis * [new ref] refs/pull/99/head -> PR-99 Switched to branch 'PR-99' HEAD is now at c224937 Merge pull request #111 from greencapitaltrade/jarvis/issue-101 checked out revision: refs/pull/99/head:PR-99@c224937c9f66350b12660e1443916a3d2902cbe7 to dir: source Showing logs for build greencapitaltrade/jarvis/pr-99 #2 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:25bf43bcaad519e9969a2dd1d104dc699778c7ea,99:c224937c9f66350b12660e1443916a3d2902cbe7:refs/pull/99/head using base branch main and base sha 25bf43bcaad519e9969a2dd1d104dc699778c7ea merging sha: c224937c9f66350b12660e1443916a3d2902cbe7 error: error during merge: merging c224937c9f66350b12660e1443916a3d2902cbe7 into main: failed to run 'git merge c224937c9f66350b12660e1443916a3d2902cbe7' command in directory '.', output: 'Auto-merging .lighthouse/jenkins-x/pullrequest.yaml Auto-merging JARVIS_TECH_CONTRACT.md CONFLICT (add/add): Merge conflict in JARVIS_TECH_CONTRACT.md Auto-merging bin/jarvis_daemon.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.