Showing logs for build greencapitaltrade/bifrost/pr-139 #5 stage from-build-pack and container prepare 2026/05/16 20:32:09 Entrypoint initialization Showing logs for build greencapitaltrade/bifrost/pr-139 #5 stage from-build-pack and container place-scripts 2026/05/16 20:32:14 Decoded script /tekton/scripts/script-0-pzbrp 2026/05/16 20:32:14 Decoded script /tekton/scripts/script-1-7c754 2026/05/16 20:32:14 Decoded script /tekton/scripts/script-2-jr8pn 2026/05/16 20:32:14 Decoded script /tekton/scripts/script-3-8xc2b 2026/05/16 20:32:14 Decoded script /tekton/scripts/script-4-b78xq 2026/05/16 20:32:14 Decoded script /tekton/scripts/script-6-98mf6 2026/05/16 20:32:14 Decoded script /tekton/scripts/script-7-2jbqd 2026/05/16 20:32:14 Decoded script /tekton/scripts/script-8-pmv7r Showing logs for build greencapitaltrade/bifrost/pr-139 #5 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/bifrost/pr-139 #5 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/bifrost.git version refs/pull/139/head:PR-139@210e2ab23399fa470d49dcc2e2d5f169424dc5c9 to dir: source Cloning into 'source'... Updating files: 30% (6118/20292) Updating files: 31% (6291/20292) Updating files: 32% (6494/20292) Updating files: 33% (6697/20292) Updating files: 34% (6900/20292) Updating files: 35% (7103/20292) Updating files: 36% (7306/20292) Updating files: 37% (7509/20292) Updating files: 38% (7711/20292) Updating files: 39% (7914/20292) Updating files: 40% (8117/20292) Updating files: 41% (8320/20292) Updating files: 42% (8523/20292) Updating files: 43% (8726/20292) Updating files: 44% (8929/20292) Updating files: 45% (9132/20292) Updating files: 46% (9335/20292) Updating files: 47% (9538/20292) Updating files: 48% (9741/20292) Updating files: 49% (9944/20292) Updating files: 50% (10146/20292) Updating files: 51% (10349/20292) Updating files: 52% (10552/20292) Updating files: 53% (10755/20292) Updating files: 54% (10958/20292) Updating files: 55% (11161/20292) Updating files: 56% (11364/20292) Updating files: 57% (11567/20292) Updating files: 57% (11679/20292) Updating files: 58% (11770/20292) Updating files: 59% (11973/20292) Updating files: 60% (12176/20292) Updating files: 61% (12379/20292) Updating files: 62% (12582/20292) Updating files: 63% (12784/20292) Updating files: 64% (12987/20292) Updating files: 65% (13190/20292) Updating files: 66% (13393/20292) Updating files: 67% (13596/20292) Updating files: 68% (13799/20292) Updating files: 69% (14002/20292) Updating files: 70% (14205/20292) Updating files: 71% (14408/20292) Updating files: 72% (14611/20292) Updating files: 73% (14814/20292) Updating files: 74% (15017/20292) Updating files: 75% (15219/20292) Updating files: 76% (15422/20292) Updating files: 77% (15625/20292) Updating files: 78% (15828/20292) Updating files: 79% (16031/20292) Updating files: 80% (16234/20292) Updating files: 81% (16437/20292) Updating files: 82% (16640/20292) Updating files: 83% (16843/20292) Updating files: 84% (17046/20292) Updating files: 85% (17249/20292) Updating files: 86% (17452/20292) Updating files: 87% (17655/20292) Updating files: 88% (17857/20292) Updating files: 89% (18060/20292) Updating files: 90% (18263/20292) Updating files: 91% (18466/20292) Updating files: 92% (18669/20292) Updating files: 93% (18872/20292) Updating files: 94% (19075/20292) Updating files: 95% (19278/20292) Updating files: 95% (19433/20292) Updating files: 96% (19481/20292) Updating files: 97% (19684/20292) Updating files: 98% (19887/20292) Updating files: 99% (20090/20292) Updating files: 100% (20292/20292) Updating files: 100% (20292/20292), done. From https://github.com/greencapitaltrade/bifrost * [new ref] refs/pull/139/head -> PR-139 Switched to branch 'PR-139' HEAD is now at 210e2ab2 fix(preview): prefer stateless checked out revision: refs/pull/139/head:PR-139@210e2ab23399fa470d49dcc2e2d5f169424dc5c9 to dir: source Showing logs for build greencapitaltrade/bifrost/pr-139 #5 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:a63601d587fb6494c4e0324431d60af8ffa58e68,139:210e2ab23399fa470d49dcc2e2d5f169424dc5c9:refs/pull/139/head using base branch main and base sha a63601d587fb6494c4e0324431d60af8ffa58e68 merging sha: 210e2ab23399fa470d49dcc2e2d5f169424dc5c9 error: error during merge: merging 210e2ab23399fa470d49dcc2e2d5f169424dc5c9 into main: failed to run 'git merge 210e2ab23399fa470d49dcc2e2d5f169424dc5c9' command in directory '.', output: 'Auto-merging addons/asset_management/controllers/asset_ble_token_api.py CONFLICT (add/add): Merge conflict in addons/asset_management/controllers/asset_ble_token_api.py Auto-merging addons/asset_management/models/asset_ble_token.py CONFLICT (add/add): Merge conflict in addons/asset_management/models/asset_ble_token.py Auto-merging addons/asset_management/tests/test_ble_token.py CONFLICT (add/add): Merge conflict in addons/asset_management/tests/test_ble_token.py Auto-merging addons/asset_management/tests/test_ble_token_server.py CONFLICT (add/add): Merge conflict in addons/asset_management/tests/test_ble_token_server.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.