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

Showing logs for build greencapitaltrade/flash/pr-183 #3 stage from-build-pack and container place-scripts
2026/09/12 19:27:09 Decoded script /tekton/scripts/script-0-fclrf
2026/09/12 19:27:09 Decoded script /tekton/scripts/script-1-fccbb
2026/09/12 19:27:09 Decoded script /tekton/scripts/script-2-79h49
2026/09/12 19:27:09 Decoded script /tekton/scripts/script-3-4c6nz
2026/09/12 19:27:09 Decoded script /tekton/scripts/script-4-jwlxp
2026/09/12 19:27:09 Decoded script /tekton/scripts/script-5-9j87s
2026/09/12 19:27:09 Decoded script /tekton/scripts/script-6-t98sl
2026/09/12 19:27:10 Decoded script /tekton/scripts/script-7-t26hq
2026/09/12 19:27:10 Decoded script /tekton/scripts/script-8-pwwlk
2026/09/12 19:27:10 Decoded script /tekton/scripts/script-9-vd4kq
2026/09/12 19:27:10 Decoded script /tekton/scripts/script-11-s8smp
2026/09/12 19:27:10 Decoded script /tekton/scripts/script-12-xbfk4

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

Showing logs for build greencapitaltrade/flash/pr-183 #3 stage from-build-pack and container step-git-clone
git cloning url: https://github.com/greencapitaltrade/flash.git version refs/pull/183/head:PR-183@365f7fea2687b516525e6cd4732665cf0e032eb3 to dir: source
Cloning into 'source'...
Updating files:  34% (333/971)
Updating files:  35% (340/971)
Updating files:  36% (350/971)
Updating files:  37% (360/971)
Updating files:  38% (369/971)
Updating files:  39% (379/971)
Updating files:  40% (389/971)
Updating files:  41% (399/971)
Updating files:  42% (408/971)
Updating files:  43% (418/971)
Updating files:  44% (428/971)
Updating files:  45% (437/971)
Updating files:  46% (447/971)
Updating files:  47% (457/971)
Updating files:  48% (467/971)
Updating files:  49% (476/971)
Updating files:  50% (486/971)
Updating files:  51% (496/971)
Updating files:  52% (505/971)
Updating files:  53% (515/971)
Updating files:  54% (525/971)
Updating files:  55% (535/971)
Updating files:  56% (544/971)
Updating files:  57% (554/971)
Updating files:  58% (564/971)
Updating files:  59% (573/971)
Updating files:  60% (583/971)
Updating files:  61% (593/971)
Updating files:  62% (603/971)
Updating files:  63% (612/971)
Updating files:  64% (622/971)
Updating files:  65% (632/971)
Updating files:  66% (641/971)
Updating files:  67% (651/971)
Updating files:  68% (661/971)
Updating files:  69% (670/971)
Updating files:  70% (680/971)
Updating files:  70% (687/971)
Updating files:  71% (690/971)
Updating files:  72% (700/971)
Updating files:  73% (709/971)
Updating files:  74% (719/971)
Updating files:  75% (729/971)
Updating files:  76% (738/971)
Updating files:  77% (748/971)
Updating files:  78% (758/971)
Updating files:  79% (768/971)
Updating files:  80% (777/971)
Updating files:  81% (787/971)
Updating files:  82% (797/971)
Updating files:  83% (806/971)
Updating files:  84% (816/971)
Updating files:  85% (826/971)
Updating files:  86% (836/971)
Updating files:  87% (845/971)
Updating files:  88% (855/971)
Updating files:  89% (865/971)
Updating files:  90% (874/971)
Updating files:  91% (884/971)
Updating files:  92% (894/971)
Updating files:  93% (904/971)
Updating files:  94% (913/971)
Updating files:  95% (923/971)
Updating files:  96% (933/971)
Updating files:  97% (942/971)
Updating files:  98% (952/971)
Updating files:  99% (962/971)
Updating files: 100% (971/971)
Updating files: 100% (971/971), done.
From https://github.com/greencapitaltrade/flash
 * [new ref]           refs/pull/183/head -> PR-183
Switched to branch 'PR-183'
HEAD is now at 365f7fea feat: wire Violations pay/waive to Fury mutations with input modals (#143)
checked out revision: refs/pull/183/head:PR-183@365f7fea2687b516525e6cd4732665cf0e032eb3 to dir: source

Showing logs for build greencapitaltrade/flash/pr-183 #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,183:365f7fea2687b516525e6cd4732665cf0e032eb3:refs/pull/183/head
using base branch main and base sha c62240d1d1c96e11777fca29c38cd8f963b56b82
merging sha: 365f7fea2687b516525e6cd4732665cf0e032eb3
error: error during merge: merging 365f7fea2687b516525e6cd4732665cf0e032eb3 into main: failed to run 'git merge 365f7fea2687b516525e6cd4732665cf0e032eb3' command in directory '.', output: 'Auto-merging packages/app/features/asset/api/hooks.ts
Auto-merging packages/app/features/asset/api/mutations.ts
Auto-merging packages/app/features/asset/screens/ViolationsListScreen.tsx
CONFLICT (content): Merge conflict in packages/app/features/asset/screens/ViolationsListScreen.tsx
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.