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

Showing logs for build greencapitaltrade/flash/pr-185 #2 stage from-build-pack and container place-scripts
2026/09/12 18:08:21 Decoded script /tekton/scripts/script-0-75bxk
2026/09/12 18:08:21 Decoded script /tekton/scripts/script-1-k4ddn
2026/09/12 18:08:21 Decoded script /tekton/scripts/script-2-g85fm
2026/09/12 18:08:21 Decoded script /tekton/scripts/script-3-m2wm2
2026/09/12 18:08:21 Decoded script /tekton/scripts/script-4-45stz
2026/09/12 18:08:21 Decoded script /tekton/scripts/script-5-ggz7h
2026/09/12 18:08:21 Decoded script /tekton/scripts/script-6-dh8w2
2026/09/12 18:08:21 Decoded script /tekton/scripts/script-7-nb444
2026/09/12 18:08:21 Decoded script /tekton/scripts/script-8-hdw29
2026/09/12 18:08:21 Decoded script /tekton/scripts/script-9-8x8b5
2026/09/12 18:08:21 Decoded script /tekton/scripts/script-11-mj2mq
2026/09/12 18:08:21 Decoded script /tekton/scripts/script-12-tn4ww

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

Showing logs for build greencapitaltrade/flash/pr-185 #2 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@0058d37b836a71bbdfb272f1cb1a01b85c6ac86f to dir: source
Cloning into 'source'...
Updating files:  70% (688/972)
Updating files:  71% (691/972)
Updating files:  72% (700/972)
Updating files:  73% (710/972)
Updating files:  74% (720/972)
Updating files:  75% (729/972)
Updating files:  76% (739/972)
Updating files:  77% (749/972)
Updating files:  78% (759/972)
Updating files:  79% (768/972)
Updating files:  80% (778/972)
Updating files:  81% (788/972)
Updating files:  82% (798/972)
Updating files:  83% (807/972)
Updating files:  84% (817/972)
Updating files:  85% (827/972)
Updating files:  86% (836/972)
Updating files:  87% (846/972)
Updating files:  88% (856/972)
Updating files:  89% (866/972)
Updating files:  90% (875/972)
Updating files:  91% (885/972)
Updating files:  92% (895/972)
Updating files:  93% (904/972)
Updating files:  94% (914/972)
Updating files:  95% (924/972)
Updating files:  96% (934/972)
Updating files:  97% (943/972)
Updating files:  98% (953/972)
Updating files:  99% (963/972)
Updating files: 100% (972/972)
Updating files: 100% (972/972), done.
From https://github.com/greencapitaltrade/flash
 * [new ref]           refs/pull/185/head -> PR-185
Switched to branch 'PR-185'
HEAD is now at 0058d37b fix(ci): pass source directory to repomix; update repomix-output.xml
checked out revision: refs/pull/185/head:PR-185@0058d37b836a71bbdfb272f1cb1a01b85c6ac86f to dir: source

Showing logs for build greencapitaltrade/flash/pr-185 #2 stage from-build-pack and container step-git-merge
setup git user  email jenkins-x@googlegroups.com
Using SHAs from PULL_REFS=main:7bcb2f4c19213ebc511ba1f29b7b899b2a3c0f3b,185:0058d37b836a71bbdfb272f1cb1a01b85c6ac86f:refs/pull/185/head
using base branch main and base sha 7bcb2f4c19213ebc511ba1f29b7b899b2a3c0f3b
merging sha: 0058d37b836a71bbdfb272f1cb1a01b85c6ac86f
error: error during merge: merging 0058d37b836a71bbdfb272f1cb1a01b85c6ac86f into main: failed to run 'git merge 0058d37b836a71bbdfb272f1cb1a01b85c6ac86f' 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 0058d37b836a71bbdfb272f1cb1a01b85c6ac86f.  Version 0058d37b836a71bbdfb272f1cb1a01b85c6ac86f of packages/app/features/asset/utils/assetGpsUtils.ts left in tree.
CONFLICT (modify/delete): repomix-output.xml deleted in HEAD and modified in 0058d37b836a71bbdfb272f1cb1a01b85c6ac86f.  Version 0058d37b836a71bbdfb272f1cb1a01b85c6ac86f 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.