Showing logs for build greencapitaltrade/flash/pr-507 #1 stage from-build-pack and container prepare
2026/09/29 08:26:46 Entrypoint initialization

Showing logs for build greencapitaltrade/flash/pr-507 #1 stage from-build-pack and container place-scripts
2026/09/29 08:26:47 Decoded script /tekton/scripts/script-0-pwlhr
2026/09/29 08:26:47 Decoded script /tekton/scripts/script-1-thcxp
2026/09/29 08:26:47 Decoded script /tekton/scripts/script-2-qtrc6
2026/09/29 08:26:47 Decoded script /tekton/scripts/script-3-6k6zm
2026/09/29 08:26:47 Decoded script /tekton/scripts/script-4-kwwjs
2026/09/29 08:26:47 Decoded script /tekton/scripts/script-5-h25pp
2026/09/29 08:26:47 Decoded script /tekton/scripts/script-6-9vm64
2026/09/29 08:26:47 Decoded script /tekton/scripts/script-7-zkwqj
2026/09/29 08:26:47 Decoded script /tekton/scripts/script-8-h8rqb
2026/09/29 08:26:47 Decoded script /tekton/scripts/script-9-b8gw5
2026/09/29 08:26:47 Decoded script /tekton/scripts/script-10-nkv64
2026/09/29 08:26:47 Decoded script /tekton/scripts/script-11-6jglb
2026/09/29 08:26:47 Decoded script /tekton/scripts/script-12-nhl7l
2026/09/29 08:26:47 Decoded script /tekton/scripts/script-13-ttst9
2026/09/29 08:26:47 Decoded script /tekton/scripts/script-15-hzbrf
2026/09/29 08:26:47 Decoded script /tekton/scripts/script-16-jss2n

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

Showing logs for build greencapitaltrade/flash/pr-507 #1 stage from-build-pack and container step-git-clone
git cloning url: https://github.com/greencapitaltrade/flash.git version refs/pull/507/head:PR-507@2d249dc3da3fec08912fd7ce22e70b7f97128295 to dir: source
Cloning into 'source'...
From https://github.com/greencapitaltrade/flash
 * [new ref]           refs/pull/507/head -> PR-507
Switched to branch 'PR-507'
HEAD is now at 2d249dc3 fix(android): compact asset list cards
checked out revision: refs/pull/507/head:PR-507@2d249dc3da3fec08912fd7ce22e70b7f97128295 to dir: source

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