Showing logs for build greencapitaltrade/flash/pr-380 #5 stage from-build-pack and container prepare
2026/08/10 11:48:03 Entrypoint initialization

Showing logs for build greencapitaltrade/flash/pr-380 #5 stage from-build-pack and container place-scripts
2026/08/10 11:48:11 Decoded script /tekton/scripts/script-0-mnd69
2026/08/10 11:48:11 Decoded script /tekton/scripts/script-1-xb4lq
2026/08/10 11:48:11 Decoded script /tekton/scripts/script-2-mvcqc
2026/08/10 11:48:11 Decoded script /tekton/scripts/script-3-rl6br
2026/08/10 11:48:11 Decoded script /tekton/scripts/script-4-dcbvd
2026/08/10 11:48:11 Decoded script /tekton/scripts/script-5-z5t67
2026/08/10 11:48:11 Decoded script /tekton/scripts/script-6-cmswl
2026/08/10 11:48:12 Decoded script /tekton/scripts/script-7-zxgs6
2026/08/10 11:48:12 Decoded script /tekton/scripts/script-8-bqm5g
2026/08/10 11:48:12 Decoded script /tekton/scripts/script-9-xdt7b
2026/08/10 11:48:12 Decoded script /tekton/scripts/script-10-nqsn9
2026/08/10 11:48:12 Decoded script /tekton/scripts/script-12-wt9mk
2026/08/10 11:48:12 Decoded script /tekton/scripts/script-13-xx9sp

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

Showing logs for build greencapitaltrade/flash/pr-380 #5 stage from-build-pack and container step-git-clone
git cloning url: https://github.com/greencapitaltrade/flash.git version refs/pull/380/head:PR-380@ae939d183615a68593fd6449805a9a300d74fa27 to dir: source
Cloning into 'source'...
From https://github.com/greencapitaltrade/flash
 * [new ref]           refs/pull/380/head -> PR-380
Switched to branch 'PR-380'
HEAD is now at ae939d18 fix(asset): stop asking for 500 models against a 200 ceiling
checked out revision: refs/pull/380/head:PR-380@ae939d183615a68593fd6449805a9a300d74fa27 to dir: source

Showing logs for build greencapitaltrade/flash/pr-380 #5 stage from-build-pack and container step-git-merge
setup git user  email jenkins-x@googlegroups.com
Using SHAs from PULL_REFS=main:36166f25d3c2fac579be36114612d58abffd5020,380:ae939d183615a68593fd6449805a9a300d74fa27:refs/pull/380/head
using base branch main and base sha 36166f25d3c2fac579be36114612d58abffd5020
merging sha: ae939d183615a68593fd6449805a9a300d74fa27
error: error during merge: merging ae939d183615a68593fd6449805a9a300d74fa27 into main: failed to run 'git merge ae939d183615a68593fd6449805a9a300d74fa27' command in directory '.', output: 'Auto-merging apps/next/server.ts
CONFLICT (content): Merge conflict in apps/next/server.ts
Auto-merging packages/app/features/asset/api/hooks.ts
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.