Showing logs for build greencapitaltrade/flash/pr-173 #12 stage from-build-pack and container prepare
2026/09/12 19:26:15 Entrypoint initialization

Showing logs for build greencapitaltrade/flash/pr-173 #12 stage from-build-pack and container place-scripts
2026/09/12 19:26:16 Decoded script /tekton/scripts/script-0-sjzfn
2026/09/12 19:26:16 Decoded script /tekton/scripts/script-1-lh8j5
2026/09/12 19:26:16 Decoded script /tekton/scripts/script-2-gblnz
2026/09/12 19:26:16 Decoded script /tekton/scripts/script-3-qtx7p
2026/09/12 19:26:16 Decoded script /tekton/scripts/script-4-86rpf
2026/09/12 19:26:16 Decoded script /tekton/scripts/script-5-zjvqx
2026/09/12 19:26:16 Decoded script /tekton/scripts/script-6-mrrx7
2026/09/12 19:26:16 Decoded script /tekton/scripts/script-7-dh9kq
2026/09/12 19:26:16 Decoded script /tekton/scripts/script-8-lnjvv
2026/09/12 19:26:16 Decoded script /tekton/scripts/script-9-7qwqs
2026/09/12 19:26:16 Decoded script /tekton/scripts/script-10-pr5d2
2026/09/12 19:26:16 Decoded script /tekton/scripts/script-11-q9mxm
2026/09/12 19:26:16 Decoded script /tekton/scripts/script-12-w4t52
2026/09/12 19:26:17 Decoded script /tekton/scripts/script-13-2kn8p

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

Showing logs for build greencapitaltrade/flash/pr-173 #12 stage from-build-pack and container step-git-clone
git cloning url: https://github.com/greencapitaltrade/flash.git version refs/pull/173/head:PR-173@78ae7f53236e7271f0b4ea6654837c1a09bd7cca to dir: source
Cloning into 'source'...
From https://github.com/greencapitaltrade/flash
 * [new ref]           refs/pull/173/head -> PR-173
Switched to branch 'PR-173'
HEAD is now at 78ae7f53 ci: make all post-jx-variables steps no-ops for baseline test
checked out revision: refs/pull/173/head:PR-173@78ae7f53236e7271f0b4ea6654837c1a09bd7cca to dir: source

Showing logs for build greencapitaltrade/flash/pr-173 #12 stage from-build-pack and container step-git-merge
setup git user  email jenkins-x@googlegroups.com
Using SHAs from PULL_REFS=main:c62240d1d1c96e11777fca29c38cd8f963b56b82,173:78ae7f53236e7271f0b4ea6654837c1a09bd7cca:refs/pull/173/head
using base branch main and base sha c62240d1d1c96e11777fca29c38cd8f963b56b82
merging sha: 78ae7f53236e7271f0b4ea6654837c1a09bd7cca
error: error during merge: merging 78ae7f53236e7271f0b4ea6654837c1a09bd7cca into main: failed to run 'git merge 78ae7f53236e7271f0b4ea6654837c1a09bd7cca' command in directory '.', output: 'Auto-merging .lighthouse/jenkins-x/pullrequest.yaml
CONFLICT (content): Merge conflict in .lighthouse/jenkins-x/pullrequest.yaml
Auto-merging apps/next/__tests__/components/gatepass-list-screen.test.tsx
CONFLICT (content): Merge conflict in apps/next/__tests__/components/gatepass-list-screen.test.tsx
Auto-merging packages/app/features/asset/api/hooks.ts
CONFLICT (content): Merge conflict in packages/app/features/asset/api/hooks.ts
Auto-merging packages/app/features/asset/api/mutations.ts
Auto-merging packages/app/features/asset/screens/GatepassListScreen.tsx
CONFLICT (content): Merge conflict in packages/app/features/asset/screens/GatepassListScreen.tsx
Auto-merging preview/helmfile.yaml.gotmpl
CONFLICT (content): Merge conflict in preview/helmfile.yaml.gotmpl
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.