Showing logs for build greencapitaltrade/flash/pr-380 #6 stage from-build-pack and container prepare
2026/08/10 12:41:32 Entrypoint initialization

Showing logs for build greencapitaltrade/flash/pr-380 #6 stage from-build-pack and container place-scripts
2026/08/10 12:41:34 Decoded script /tekton/scripts/script-0-vvb7r
2026/08/10 12:41:34 Decoded script /tekton/scripts/script-1-nq92j
2026/08/10 12:41:34 Decoded script /tekton/scripts/script-2-x5wzg
2026/08/10 12:41:34 Decoded script /tekton/scripts/script-3-s6nlj
2026/08/10 12:41:34 Decoded script /tekton/scripts/script-4-2vfd7
2026/08/10 12:41:34 Decoded script /tekton/scripts/script-5-6q66z
2026/08/10 12:41:34 Decoded script /tekton/scripts/script-6-48w2p
2026/08/10 12:41:34 Decoded script /tekton/scripts/script-7-lb5rj
2026/08/10 12:41:35 Decoded script /tekton/scripts/script-8-xnwsc
2026/08/10 12:41:35 Decoded script /tekton/scripts/script-9-jb998
2026/08/10 12:41:35 Decoded script /tekton/scripts/script-10-9s5p2
2026/08/10 12:41:35 Decoded script /tekton/scripts/script-12-dflzc
2026/08/10 12:41:35 Decoded script /tekton/scripts/script-13-qnmt7

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

Showing logs for build greencapitaltrade/flash/pr-380 #6 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@a1750d9719a92cfa70f655563fecdded2098830b 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 a1750d97 chore: record @noble/hashes in the lockfile
checked out revision: refs/pull/380/head:PR-380@a1750d9719a92cfa70f655563fecdded2098830b to dir: source

Showing logs for build greencapitaltrade/flash/pr-380 #6 stage from-build-pack and container step-git-merge
setup git user  email jenkins-x@googlegroups.com
Using SHAs from PULL_REFS=main:19c4e748328dfbbeabffd48c45cb11e620201a54,380:a1750d9719a92cfa70f655563fecdded2098830b:refs/pull/380/head
using base branch main and base sha 19c4e748328dfbbeabffd48c45cb11e620201a54
merging sha: a1750d9719a92cfa70f655563fecdded2098830b
error: error during merge: merging a1750d9719a92cfa70f655563fecdded2098830b into main: failed to run 'git merge a1750d9719a92cfa70f655563fecdded2098830b' 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.