Showing logs for build greencapitaltrade/flash/pr-187 #3 stage from-build-pack and container prepare
2026/09/12 18:07:20 Entrypoint initialization

Showing logs for build greencapitaltrade/flash/pr-187 #3 stage from-build-pack and container place-scripts
2026/09/12 18:07:21 Decoded script /tekton/scripts/script-0-fd97z
2026/09/12 18:07:21 Decoded script /tekton/scripts/script-1-rkdgb
2026/09/12 18:07:21 Decoded script /tekton/scripts/script-2-hcx7m
2026/09/12 18:07:21 Decoded script /tekton/scripts/script-3-r26zx
2026/09/12 18:07:21 Decoded script /tekton/scripts/script-4-4spz9
2026/09/12 18:07:21 Decoded script /tekton/scripts/script-5-qj56s
2026/09/12 18:07:21 Decoded script /tekton/scripts/script-6-x4284
2026/09/12 18:07:21 Decoded script /tekton/scripts/script-7-sqcbz
2026/09/12 18:07:21 Decoded script /tekton/scripts/script-8-5x4q2
2026/09/12 18:07:21 Decoded script /tekton/scripts/script-9-kpt9s
2026/09/12 18:07:21 Decoded script /tekton/scripts/script-11-7llbl
2026/09/12 18:07:21 Decoded script /tekton/scripts/script-12-vb5nd

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

Showing logs for build greencapitaltrade/flash/pr-187 #3 stage from-build-pack and container step-git-clone
git cloning url: https://github.com/greencapitaltrade/flash.git version refs/pull/187/head:PR-187@951b0ea0ca72604da5c52abc5ecd279f16872f87 to dir: source
Cloning into 'source'...
From https://github.com/greencapitaltrade/flash
 * [new ref]           refs/pull/187/head -> PR-187
Switched to branch 'PR-187'
HEAD is now at 951b0ea0 fix(ci): pass source directory to repomix; update repomix-output.xml
checked out revision: refs/pull/187/head:PR-187@951b0ea0ca72604da5c52abc5ecd279f16872f87 to dir: source

Showing logs for build greencapitaltrade/flash/pr-187 #3 stage from-build-pack and container step-git-merge
setup git user  email jenkins-x@googlegroups.com
Using SHAs from PULL_REFS=main:7bcb2f4c19213ebc511ba1f29b7b899b2a3c0f3b,187:951b0ea0ca72604da5c52abc5ecd279f16872f87:refs/pull/187/head
using base branch main and base sha 7bcb2f4c19213ebc511ba1f29b7b899b2a3c0f3b
merging sha: 951b0ea0ca72604da5c52abc5ecd279f16872f87
error: error during merge: merging 951b0ea0ca72604da5c52abc5ecd279f16872f87 into main: failed to run 'git merge 951b0ea0ca72604da5c52abc5ecd279f16872f87' command in directory '.', output: 'Auto-merging .lighthouse/jenkins-x/pullrequest.yaml
CONFLICT (content): Merge conflict in .lighthouse/jenkins-x/pullrequest.yaml
CONFLICT (modify/delete): repomix-output.xml deleted in HEAD and modified in 951b0ea0ca72604da5c52abc5ecd279f16872f87.  Version 951b0ea0ca72604da5c52abc5ecd279f16872f87 of repomix-output.xml left in tree.
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.