Showing logs for build greencapitaltrade/flash/pr-480 #1 stage from-build-pack and container prepare
2026/09/25 18:46:27 Entrypoint initialization

Showing logs for build greencapitaltrade/flash/pr-480 #1 stage from-build-pack and container place-scripts
2026/09/25 18:46:28 Decoded script /tekton/scripts/script-0-x5n75
2026/09/25 18:46:28 Decoded script /tekton/scripts/script-1-rjslp
2026/09/25 18:46:28 Decoded script /tekton/scripts/script-2-w7dnn
2026/09/25 18:46:28 Decoded script /tekton/scripts/script-3-wvr6d
2026/09/25 18:46:28 Decoded script /tekton/scripts/script-4-84mb2
2026/09/25 18:46:28 Decoded script /tekton/scripts/script-5-9hw6m
2026/09/25 18:46:28 Decoded script /tekton/scripts/script-6-2rmv9
2026/09/25 18:46:28 Decoded script /tekton/scripts/script-7-vlbhp
2026/09/25 18:46:28 Decoded script /tekton/scripts/script-8-62gd6
2026/09/25 18:46:28 Decoded script /tekton/scripts/script-9-4j2lc
2026/09/25 18:46:28 Decoded script /tekton/scripts/script-10-wjxph
2026/09/25 18:46:28 Decoded script /tekton/scripts/script-11-zvk6b
2026/09/25 18:46:28 Decoded script /tekton/scripts/script-12-mnwxc
2026/09/25 18:46:28 Decoded script /tekton/scripts/script-13-rwqq4
2026/09/25 18:46:28 Decoded script /tekton/scripts/script-15-qvcgp
2026/09/25 18:46:28 Decoded script /tekton/scripts/script-16-mxmgf

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

Showing logs for build greencapitaltrade/flash/pr-480 #1 stage from-build-pack and container step-git-clone
git cloning url: https://github.com/greencapitaltrade/flash.git version refs/pull/480/head:PR-480@3449cf9f57ddb01e7a94d0f67d2ec4651d7d849a to dir: source
Cloning into 'source'...
From https://github.com/greencapitaltrade/flash
 * [new ref]           refs/pull/480/head -> PR-480
Switched to branch 'PR-480'
HEAD is now at 3449cf9f fix(android): make private cache lifecycle explicit
checked out revision: refs/pull/480/head:PR-480@3449cf9f57ddb01e7a94d0f67d2ec4651d7d849a to dir: source

Showing logs for build greencapitaltrade/flash/pr-480 #1 stage from-build-pack and container step-git-merge
setup git user  email jenkins-x@googlegroups.com
Using SHAs from PULL_REFS=main:4e27ea3f539a6b4b90366e99bb9c1491f88dfd33,480:3449cf9f57ddb01e7a94d0f67d2ec4651d7d849a:refs/pull/480/head
using base branch main and base sha 4e27ea3f539a6b4b90366e99bb9c1491f88dfd33
merging sha: 3449cf9f57ddb01e7a94d0f67d2ec4651d7d849a
error: error during merge: merging 3449cf9f57ddb01e7a94d0f67d2ec4651d7d849a into main: failed to run 'git merge 3449cf9f57ddb01e7a94d0f67d2ec4651d7d849a' command in directory '.', output: 'Auto-merging 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
CONFLICT (content): Merge conflict in 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/businessmodel/BusinessModelManagementScreen.kt
CONFLICT (content): Merge conflict in native/android/shared-app/src/main/java/com/voltcred/flash/businessmodel/BusinessModelManagementScreen.kt
Auto-merging native/android/shared-app/src/main/java/com/voltcred/flash/geofence/GeofenceScreens.kt
CONFLICT (content): Merge conflict in native/android/shared-app/src/main/java/com/voltcred/flash/geofence/GeofenceScreens.kt
Auto-merging native/android/shared-app/src/main/java/com/voltcred/flash/team/JournalScreen.kt
CONFLICT (content): Merge conflict in native/android/shared-app/src/main/java/com/voltcred/flash/team/JournalScreen.kt
Auto-merging native/android/shared-app/src/main/java/com/voltcred/flash/team/TeamManagementScreens.kt
CONFLICT (content): Merge conflict in native/android/shared-app/src/main/java/com/voltcred/flash/team/TeamManagementScreens.kt
Auto-merging native/android/shared-app/src/main/java/com/voltcred/flash/ui/components/FlashComponents.kt
CONFLICT (content): Merge conflict in native/android/shared-app/src/main/java/com/voltcred/flash/ui/components/FlashComponents.kt
Auto-merging native/android/shared-app/src/main/java/com/voltcred/flash/ui/controltower/ControlTowerScreen.kt
CONFLICT (content): Merge conflict in native/android/shared-app/src/main/java/com/voltcred/flash/ui/controltower/ControlTowerScreen.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.