Showing logs for build greencapitaltrade/bifrost/pr-445 #2 stage from-build-pack and container prepare
2026/08/03 10:48:20 Entrypoint initialization

Showing logs for build greencapitaltrade/bifrost/pr-445 #2 stage from-build-pack and container place-scripts
2026/08/03 10:48:21 Decoded script /tekton/scripts/script-0-ndmzc
2026/08/03 10:48:21 Decoded script /tekton/scripts/script-1-hdnzk
2026/08/03 10:48:21 Decoded script /tekton/scripts/script-2-fkj65
2026/08/03 10:48:21 Decoded script /tekton/scripts/script-3-79kxq
2026/08/03 10:48:21 Decoded script /tekton/scripts/script-4-cx5xs
2026/08/03 10:48:21 Decoded script /tekton/scripts/script-5-2lrg4
2026/08/03 10:48:21 Decoded script /tekton/scripts/script-7-qxqr4
2026/08/03 10:48:21 Decoded script /tekton/scripts/script-8-bqt2d
2026/08/03 10:48:21 Decoded script /tekton/scripts/script-9-n6b5d

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

Showing logs for build greencapitaltrade/bifrost/pr-445 #2 stage from-build-pack and container step-git-clone
git cloning url: https://github.com/greencapitaltrade/bifrost.git version refs/pull/445/head:PR-445@da1991071392a90e2f30f2fa7a6ebf4a4c64cf7d to dir: source
Cloning into 'source'...
Updating files:  35% (7330/20432)
Updating files:  36% (7356/20432)
Updating files:  37% (7560/20432)
Updating files:  38% (7765/20432)
Updating files:  39% (7969/20432)
Updating files:  40% (8173/20432)
Updating files:  41% (8378/20432)
Updating files:  42% (8582/20432)
Updating files:  43% (8786/20432)
Updating files:  44% (8991/20432)
Updating files:  45% (9195/20432)
Updating files:  46% (9399/20432)
Updating files:  47% (9604/20432)
Updating files:  48% (9808/20432)
Updating files:  49% (10012/20432)
Updating files:  50% (10216/20432)
Updating files:  51% (10421/20432)
Updating files:  52% (10625/20432)
Updating files:  53% (10829/20432)
Updating files:  54% (11034/20432)
Updating files:  55% (11238/20432)
Updating files:  56% (11442/20432)
Updating files:  57% (11647/20432)
Updating files:  58% (11851/20432)
Updating files:  59% (12055/20432)
Updating files:  60% (12260/20432)
Updating files:  61% (12464/20432)
Updating files:  62% (12668/20432)
Updating files:  63% (12873/20432)
Updating files:  64% (13077/20432)
Updating files:  65% (13281/20432)
Updating files:  66% (13486/20432)
Updating files:  67% (13690/20432)
Updating files:  68% (13894/20432)
Updating files:  69% (14099/20432)
Updating files:  70% (14303/20432)
Updating files:  71% (14507/20432)
Updating files:  72% (14712/20432)
Updating files:  73% (14916/20432)
Updating files:  74% (15120/20432)
Updating files:  75% (15324/20432)
Updating files:  76% (15529/20432)
Updating files:  77% (15733/20432)
Updating files:  78% (15937/20432)
Updating files:  79% (16142/20432)
Updating files:  80% (16346/20432)
Updating files:  80% (16389/20432)
Updating files:  81% (16550/20432)
Updating files:  82% (16755/20432)
Updating files:  83% (16959/20432)
Updating files:  84% (17163/20432)
Updating files:  85% (17368/20432)
Updating files:  86% (17572/20432)
Updating files:  87% (17776/20432)
Updating files:  88% (17981/20432)
Updating files:  89% (18185/20432)
Updating files:  90% (18389/20432)
Updating files:  91% (18594/20432)
Updating files:  92% (18798/20432)
Updating files:  93% (19002/20432)
Updating files:  94% (19207/20432)
Updating files:  95% (19411/20432)
Updating files:  96% (19615/20432)
Updating files:  97% (19820/20432)
Updating files:  98% (20024/20432)
Updating files:  99% (20228/20432)
Updating files: 100% (20432/20432)
Updating files: 100% (20432/20432), done.
From https://github.com/greencapitaltrade/bifrost
 * [new ref]           refs/pull/445/head -> PR-445
Switched to branch 'PR-445'
HEAD is now at da199107 refactor(iot): move IoT DB connection settings out of company settings UI
checked out revision: refs/pull/445/head:PR-445@da1991071392a90e2f30f2fa7a6ebf4a4c64cf7d to dir: source

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