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

Showing logs for build greencapitaltrade/flash/pr-183 #2 stage from-build-pack and container place-scripts
2026/09/12 18:09:16 Decoded script /tekton/scripts/script-0-27zmb
2026/09/12 18:09:16 Decoded script /tekton/scripts/script-1-5jqs4
2026/09/12 18:09:16 Decoded script /tekton/scripts/script-2-rrpqk
2026/09/12 18:09:16 Decoded script /tekton/scripts/script-3-7vmjt
2026/09/12 18:09:16 Decoded script /tekton/scripts/script-4-h6mkh
2026/09/12 18:09:16 Decoded script /tekton/scripts/script-5-g8fdp
2026/09/12 18:09:16 Decoded script /tekton/scripts/script-6-f9tdm
2026/09/12 18:09:16 Decoded script /tekton/scripts/script-7-bk62s
2026/09/12 18:09:16 Decoded script /tekton/scripts/script-8-hrznb
2026/09/12 18:09:16 Decoded script /tekton/scripts/script-9-5sbxz
2026/09/12 18:09:16 Decoded script /tekton/scripts/script-11-k89sq
2026/09/12 18:09:16 Decoded script /tekton/scripts/script-12-lrcl4

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

Showing logs for build greencapitaltrade/flash/pr-183 #2 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@525d28b4dbdab6cad1cf876506682a1752ac0174 to dir: source
Cloning into 'source'...
From https://github.com/greencapitaltrade/flash
 * [new ref]           refs/pull/183/head -> PR-183
Switched to branch 'PR-183'
HEAD is now at 525d28b4 feat: wire Violations pay/waive to Fury mutations with input modals (#143)
checked out revision: refs/pull/183/head:PR-183@525d28b4dbdab6cad1cf876506682a1752ac0174 to dir: source

Showing logs for build greencapitaltrade/flash/pr-183 #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,183:525d28b4dbdab6cad1cf876506682a1752ac0174:refs/pull/183/head
using base branch main and base sha 7bcb2f4c19213ebc511ba1f29b7b899b2a3c0f3b
merging sha: 525d28b4dbdab6cad1cf876506682a1752ac0174
error: error during merge: merging 525d28b4dbdab6cad1cf876506682a1752ac0174 into main: failed to run 'git merge 525d28b4dbdab6cad1cf876506682a1752ac0174' 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.