Showing logs for build greencapitaltrade/flash/pr-187 #4 stage from-build-pack and container prepare 2026/09/12 19:26:12 Entrypoint initialization Showing logs for build greencapitaltrade/flash/pr-187 #4 stage from-build-pack and container place-scripts 2026/09/12 19:26:13 Decoded script /tekton/scripts/script-0-l5r68 2026/09/12 19:26:13 Decoded script /tekton/scripts/script-1-b2ngc 2026/09/12 19:26:13 Decoded script /tekton/scripts/script-2-8vpzr 2026/09/12 19:26:13 Decoded script /tekton/scripts/script-3-fxrfg 2026/09/12 19:26:13 Decoded script /tekton/scripts/script-4-vtzld 2026/09/12 19:26:13 Decoded script /tekton/scripts/script-5-q7v4l 2026/09/12 19:26:13 Decoded script /tekton/scripts/script-6-vgqx8 2026/09/12 19:26:13 Decoded script /tekton/scripts/script-7-cpnt7 2026/09/12 19:26:13 Decoded script /tekton/scripts/script-8-rwc94 2026/09/12 19:26:13 Decoded script /tekton/scripts/script-9-gzl5z 2026/09/12 19:26:13 Decoded script /tekton/scripts/script-11-thdw9 2026/09/12 19:26:13 Decoded script /tekton/scripts/script-12-jdrzn Showing logs for build greencapitaltrade/flash/pr-187 #4 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/flash/pr-187 #4 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@fc3ba31a18735459cad5cff881ac199c9e142bc4 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 fc3ba31a fix(ci): pass source directory to repomix; update repomix-output.xml checked out revision: refs/pull/187/head:PR-187@fc3ba31a18735459cad5cff881ac199c9e142bc4 to dir: source Showing logs for build greencapitaltrade/flash/pr-187 #4 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:c62240d1d1c96e11777fca29c38cd8f963b56b82,187:fc3ba31a18735459cad5cff881ac199c9e142bc4:refs/pull/187/head using base branch main and base sha c62240d1d1c96e11777fca29c38cd8f963b56b82 merging sha: fc3ba31a18735459cad5cff881ac199c9e142bc4 error: error during merge: merging fc3ba31a18735459cad5cff881ac199c9e142bc4 into main: failed to run 'git merge fc3ba31a18735459cad5cff881ac199c9e142bc4' 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 fc3ba31a18735459cad5cff881ac199c9e142bc4. Version fc3ba31a18735459cad5cff881ac199c9e142bc4 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.