Showing logs for build greencapitaltrade/bifrost/pr-585 #4 stage from-build-pack and container prepare
2026/09/26 21:13:03 Entrypoint initialization

Showing logs for build greencapitaltrade/bifrost/pr-585 #4 stage from-build-pack and container place-scripts
2026/09/26 21:13:04 Decoded script /tekton/scripts/script-0-cjcqn
2026/09/26 21:13:04 Decoded script /tekton/scripts/script-1-pd9f4
2026/09/26 21:13:04 Decoded script /tekton/scripts/script-2-bcmmc
2026/09/26 21:13:04 Decoded script /tekton/scripts/script-3-p4wq5
2026/09/26 21:13:04 Decoded script /tekton/scripts/script-4-x54tf
2026/09/26 21:13:04 Decoded script /tekton/scripts/script-6-48j2s
2026/09/26 21:13:04 Decoded script /tekton/scripts/script-7-tb4qx
2026/09/26 21:13:04 Decoded script /tekton/scripts/script-8-5nx2r

Showing logs for build greencapitaltrade/bifrost/pr-585 #4 stage from-build-pack and container working-dir-initializer

Showing logs for build greencapitaltrade/bifrost/pr-585 #4 stage from-build-pack and container step-git-clone
git cloning url: https://github.com/greencapitaltrade/bifrost.git version refs/pull/585/head:PR-585@99588941c9eaf07ca3a3d0924f636c0254c6f362 to dir: source
Cloning into 'source'...
Updating files:  37% (7785/20569)
Updating files:  38% (7817/20569)
Updating files:  39% (8022/20569)
Updating files:  40% (8228/20569)
Updating files:  41% (8434/20569)
Updating files:  42% (8639/20569)
Updating files:  43% (8845/20569)
Updating files:  44% (9051/20569)
Updating files:  45% (9257/20569)
Updating files:  46% (9462/20569)
Updating files:  47% (9668/20569)
Updating files:  48% (9874/20569)
Updating files:  49% (10079/20569)
Updating files:  50% (10285/20569)
Updating files:  51% (10491/20569)
Updating files:  52% (10696/20569)
Updating files:  53% (10902/20569)
Updating files:  54% (11108/20569)
Updating files:  55% (11313/20569)
Updating files:  56% (11519/20569)
Updating files:  57% (11725/20569)
Updating files:  58% (11931/20569)
Updating files:  59% (12136/20569)
Updating files:  60% (12342/20569)
Updating files:  61% (12548/20569)
Updating files:  62% (12753/20569)
Updating files:  63% (12959/20569)
Updating files:  64% (13165/20569)
Updating files:  65% (13370/20569)
Updating files:  66% (13576/20569)
Updating files:  67% (13782/20569)
Updating files:  68% (13987/20569)
Updating files:  69% (14193/20569)
Updating files:  70% (14399/20569)
Updating files:  71% (14604/20569)
Updating files:  72% (14810/20569)
Updating files:  73% (15016/20569)
Updating files:  74% (15222/20569)
Updating files:  75% (15427/20569)
Updating files:  76% (15633/20569)
Updating files:  77% (15839/20569)
Updating files:  78% (16044/20569)
Updating files:  79% (16250/20569)
Updating files:  80% (16456/20569)
Updating files:  81% (16661/20569)
Updating files:  82% (16867/20569)
Updating files:  83% (17073/20569)
Updating files:  83% (17242/20569)
Updating files:  84% (17278/20569)
Updating files:  85% (17484/20569)
Updating files:  86% (17690/20569)
Updating files:  87% (17896/20569)
Updating files:  88% (18101/20569)
Updating files:  89% (18307/20569)
Updating files:  90% (18513/20569)
Updating files:  91% (18718/20569)
Updating files:  92% (18924/20569)
Updating files:  93% (19130/20569)
Updating files:  94% (19335/20569)
Updating files:  95% (19541/20569)
Updating files:  96% (19747/20569)
Updating files:  97% (19952/20569)
Updating files:  98% (20158/20569)
Updating files:  99% (20364/20569)
Updating files: 100% (20569/20569)
Updating files: 100% (20569/20569), done.
From https://github.com/greencapitaltrade/bifrost
 * [new ref]           refs/pull/585/head -> PR-585
Switched to branch 'PR-585'
HEAD is now at 99588941 Merge remote-tracking branch 'origin/main' into codex/pr-585
checked out revision: refs/pull/585/head:PR-585@99588941c9eaf07ca3a3d0924f636c0254c6f362 to dir: source

Showing logs for build greencapitaltrade/bifrost/pr-585 #4 stage from-build-pack and container step-git-merge
setup git user  email jenkins-x@googlegroups.com
Using SHAs from PULL_REFS=main:12439ab80fcc6d30937a66c4a807e9598d2a25ea,585:99588941c9eaf07ca3a3d0924f636c0254c6f362:refs/pull/585/head
using base branch main and base sha 12439ab80fcc6d30937a66c4a807e9598d2a25ea
merging sha: 99588941c9eaf07ca3a3d0924f636c0254c6f362
error: error during merge: merging 99588941c9eaf07ca3a3d0924f636c0254c6f362 into main: failed to run 'git merge 99588941c9eaf07ca3a3d0924f636c0254c6f362' command in directory '.', output: 'Auto-merging addons/asset_management/models/asset_checklist.py
Auto-merging addons/asset_management/tests/test_checklist_api.py
CONFLICT (content): Merge conflict in addons/asset_management/tests/test_checklist_api.py
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.