Showing logs for build greencapitaltrade/flash/pr-594 #1 stage from-build-pack and container prepare
2026/10/31 07:55:51 Entrypoint initialization

Showing logs for build greencapitaltrade/flash/pr-594 #1 stage from-build-pack and container place-scripts
2026/10/31 07:55:52 Decoded script /tekton/scripts/script-0-r5m9v
2026/10/31 07:55:52 Decoded script /tekton/scripts/script-1-x9kbv
2026/10/31 07:55:52 Decoded script /tekton/scripts/script-2-jxxnk
2026/10/31 07:55:52 Decoded script /tekton/scripts/script-3-r74jx
2026/10/31 07:55:52 Decoded script /tekton/scripts/script-4-98sqm
2026/10/31 07:55:52 Decoded script /tekton/scripts/script-5-88ndp
2026/10/31 07:55:52 Decoded script /tekton/scripts/script-6-8tl9q
2026/10/31 07:55:52 Decoded script /tekton/scripts/script-7-lgr6j
2026/10/31 07:55:52 Decoded script /tekton/scripts/script-8-tqbrz
2026/10/31 07:55:52 Decoded script /tekton/scripts/script-9-8vbbv
2026/10/31 07:55:52 Decoded script /tekton/scripts/script-10-nkl9r
2026/10/31 07:55:52 Decoded script /tekton/scripts/script-11-cw969
2026/10/31 07:55:52 Decoded script /tekton/scripts/script-12-g2fbk
2026/10/31 07:55:52 Decoded script /tekton/scripts/script-13-xhtxd
2026/10/31 07:55:52 Decoded script /tekton/scripts/script-14-z5kkk
2026/10/31 07:55:52 Decoded script /tekton/scripts/script-16-kvgvl
2026/10/31 07:55:52 Decoded script /tekton/scripts/script-17-xj9d4

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

Showing logs for build greencapitaltrade/flash/pr-594 #1 stage from-build-pack and container step-git-clone
git cloning url: https://github.com/greencapitaltrade/flash.git version refs/pull/594/head:PR-594@d5e981306aed5271d539033d2757e6900fd37697 to dir: source
Cloning into 'source'...
From https://github.com/greencapitaltrade/flash
 * [new ref]           refs/pull/594/head -> PR-594
Switched to branch 'PR-594'
HEAD is now at d5e98130 fix: balance onboarding choices and bind plans to assets
checked out revision: refs/pull/594/head:PR-594@d5e981306aed5271d539033d2757e6900fd37697 to dir: source

Showing logs for build greencapitaltrade/flash/pr-594 #1 stage from-build-pack and container step-git-merge
setup git user  email jenkins-x@googlegroups.com
Using SHAs from PULL_REFS=main:724559cb058dacd6f8122f06854a1fac95a70fc4,594:d5e981306aed5271d539033d2757e6900fd37697:refs/pull/594/head
using base branch main and base sha 724559cb058dacd6f8122f06854a1fac95a70fc4
merging sha: d5e981306aed5271d539033d2757e6900fd37697
error: error during merge: merging d5e981306aed5271d539033d2757e6900fd37697 into main: failed to run 'git merge d5e981306aed5271d539033d2757e6900fd37697' command in directory '.', output: 'Auto-merging ASSET_MANAGEMENT.md
CONFLICT (content): Merge conflict in ASSET_MANAGEMENT.md
Auto-merging native/android/shared-app/src/main/graphql/schema.graphqls
Auto-merging native/android/shared-app/src/main/java/com/voltcred/flash/MainActivity.kt
CONFLICT (content): Merge conflict in native/android/shared-app/src/main/java/com/voltcred/flash/MainActivity.kt
Auto-merging native/android/shared-app/src/main/java/com/voltcred/flash/assets/AssetsScreen.kt
Auto-merging native/android/shared-app/src/main/java/com/voltcred/flash/data/FlashRepository.kt
Auto-merging native/android/shared-app/src/test/java/com/voltcred/flash/MainActivityNavigationTest.kt
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.