Showing logs for build greencapitaltrade/flash/pr-380 #8 stage from-build-pack and container prepare
2026/08/11 06:33:49 Entrypoint initialization

Showing logs for build greencapitaltrade/flash/pr-380 #8 stage from-build-pack and container place-scripts
2026/08/11 06:33:50 Decoded script /tekton/scripts/script-0-68n8b
2026/08/11 06:33:50 Decoded script /tekton/scripts/script-1-bkwxr
2026/08/11 06:33:50 Decoded script /tekton/scripts/script-2-vvbmg
2026/08/11 06:33:50 Decoded script /tekton/scripts/script-3-4mfj6
2026/08/11 06:33:50 Decoded script /tekton/scripts/script-4-lkzbv
2026/08/11 06:33:50 Decoded script /tekton/scripts/script-5-snxq8
2026/08/11 06:33:50 Decoded script /tekton/scripts/script-6-8fp5h
2026/08/11 06:33:50 Decoded script /tekton/scripts/script-7-gng6l
2026/08/11 06:33:50 Decoded script /tekton/scripts/script-8-qxmxb
2026/08/11 06:33:50 Decoded script /tekton/scripts/script-9-74pdv
2026/08/11 06:33:50 Decoded script /tekton/scripts/script-10-cg66s
2026/08/11 06:33:50 Decoded script /tekton/scripts/script-12-dslr5
2026/08/11 06:33:50 Decoded script /tekton/scripts/script-13-q72sj

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

Showing logs for build greencapitaltrade/flash/pr-380 #8 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 #8 stage from-build-pack and container step-git-merge
setup git user  email jenkins-x@googlegroups.com
Using SHAs from PULL_REFS=main:2d362b74494afd3250747b76ca4f0fd365a66623,380:a1750d9719a92cfa70f655563fecdded2098830b:refs/pull/380/head
using base branch main and base sha 2d362b74494afd3250747b76ca4f0fd365a66623
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
Auto-merging packages/app/features/asset/api/queries.ts
Auto-merging packages/app/features/asset/screen.tsx
Auto-merging packages/app/package.json
CONFLICT (modify/delete): packages/app/provider/apollo-client/apolloClient.ts deleted in HEAD and modified in a1750d9719a92cfa70f655563fecdded2098830b.  Version a1750d9719a92cfa70f655563fecdded2098830b of packages/app/provider/apollo-client/apolloClient.ts 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.