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

Showing logs for build greencapitaltrade/flash/pr-185 #3 stage from-build-pack and container place-scripts
2026/09/12 19:26:42 Decoded script /tekton/scripts/script-0-6dtnd
2026/09/12 19:26:42 Decoded script /tekton/scripts/script-1-pc9qr
2026/09/12 19:26:42 Decoded script /tekton/scripts/script-2-t9sq5
2026/09/12 19:26:42 Decoded script /tekton/scripts/script-3-txrx4
2026/09/12 19:26:42 Decoded script /tekton/scripts/script-4-rwtfv
2026/09/12 19:26:42 Decoded script /tekton/scripts/script-5-d9lrj
2026/09/12 19:26:42 Decoded script /tekton/scripts/script-6-fdq29
2026/09/12 19:26:42 Decoded script /tekton/scripts/script-7-hkmn5
2026/09/12 19:26:42 Decoded script /tekton/scripts/script-8-g8qdb
2026/09/12 19:26:42 Decoded script /tekton/scripts/script-9-lrfcx
2026/09/12 19:26:42 Decoded script /tekton/scripts/script-11-ntgn6
2026/09/12 19:26:42 Decoded script /tekton/scripts/script-12-kmvnl

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

Showing logs for build greencapitaltrade/flash/pr-185 #3 stage from-build-pack and container step-git-clone
git cloning url: https://github.com/greencapitaltrade/flash.git version refs/pull/185/head:PR-185@346999df9760e55d2d429bd12dcc06481d55e35b to dir: source
Cloning into 'source'...
From https://github.com/greencapitaltrade/flash
 * [new ref]           refs/pull/185/head -> PR-185
Switched to branch 'PR-185'
HEAD is now at 346999df fix(ci): pass source directory to repomix; update repomix-output.xml
checked out revision: refs/pull/185/head:PR-185@346999df9760e55d2d429bd12dcc06481d55e35b to dir: source

Showing logs for build greencapitaltrade/flash/pr-185 #3 stage from-build-pack and container step-git-merge
setup git user  email jenkins-x@googlegroups.com
Using SHAs from PULL_REFS=main:c62240d1d1c96e11777fca29c38cd8f963b56b82,185:346999df9760e55d2d429bd12dcc06481d55e35b:refs/pull/185/head
using base branch main and base sha c62240d1d1c96e11777fca29c38cd8f963b56b82
merging sha: 346999df9760e55d2d429bd12dcc06481d55e35b
error: error during merge: merging 346999df9760e55d2d429bd12dcc06481d55e35b into main: failed to run 'git merge 346999df9760e55d2d429bd12dcc06481d55e35b' 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 apps/next/__tests__/components/violations-list-screen.test.tsx
CONFLICT (content): Merge conflict in apps/next/__tests__/components/violations-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 packages/app/features/asset/screens/ViolationsListScreen.tsx
CONFLICT (content): Merge conflict in packages/app/features/asset/screens/ViolationsListScreen.tsx
CONFLICT (modify/delete): packages/app/features/asset/utils/assetGpsUtils.ts deleted in HEAD and modified in 346999df9760e55d2d429bd12dcc06481d55e35b.  Version 346999df9760e55d2d429bd12dcc06481d55e35b of packages/app/features/asset/utils/assetGpsUtils.ts left in tree.
CONFLICT (modify/delete): repomix-output.xml deleted in HEAD and modified in 346999df9760e55d2d429bd12dcc06481d55e35b.  Version 346999df9760e55d2d429bd12dcc06481d55e35b 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.