Showing logs for build greencapitaltrade/bifrost/pr-588 #4 stage from-build-pack and container prepare 2026/09/26 22:40:18 Entrypoint initialization Showing logs for build greencapitaltrade/bifrost/pr-588 #4 stage from-build-pack and container place-scripts 2026/09/26 22:40:19 Decoded script /tekton/scripts/script-0-kfd6b 2026/09/26 22:40:19 Decoded script /tekton/scripts/script-1-k5n64 2026/09/26 22:40:19 Decoded script /tekton/scripts/script-2-w7nm4 2026/09/26 22:40:19 Decoded script /tekton/scripts/script-3-rm6kp 2026/09/26 22:40:19 Decoded script /tekton/scripts/script-4-x468l 2026/09/26 22:40:19 Decoded script /tekton/scripts/script-6-vp27c 2026/09/26 22:40:19 Decoded script /tekton/scripts/script-7-v2c5j 2026/09/26 22:40:19 Decoded script /tekton/scripts/script-8-rjllr Showing logs for build greencapitaltrade/bifrost/pr-588 #4 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/bifrost/pr-588 #4 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/bifrost.git version refs/pull/588/head:PR-588@ad027ad31d76b2a45c51ba5865d38a50e3fd5128 to dir: source Cloning into 'source'... Updating files: 21% (4441/20570) Updating files: 22% (4526/20570) Updating files: 23% (4732/20570) Updating files: 24% (4937/20570) Updating files: 25% (5143/20570) Updating files: 26% (5349/20570) Updating files: 27% (5554/20570) Updating files: 28% (5760/20570) Updating files: 29% (5966/20570) Updating files: 30% (6171/20570) Updating files: 31% (6377/20570) Updating files: 32% (6583/20570) Updating files: 33% (6789/20570) Updating files: 34% (6994/20570) Updating files: 35% (7200/20570) Updating files: 36% (7406/20570) Updating files: 37% (7611/20570) Updating files: 38% (7817/20570) Updating files: 39% (8023/20570) Updating files: 40% (8228/20570) Updating files: 41% (8434/20570) Updating files: 42% (8640/20570) Updating files: 43% (8846/20570) Updating files: 43% (8923/20570) Updating files: 44% (9051/20570) Updating files: 45% (9257/20570) Updating files: 46% (9463/20570) Updating files: 47% (9668/20570) Updating files: 48% (9874/20570) Updating files: 49% (10080/20570) Updating files: 50% (10285/20570) Updating files: 51% (10491/20570) Updating files: 52% (10697/20570) Updating files: 53% (10903/20570) Updating files: 54% (11108/20570) Updating files: 55% (11314/20570) Updating files: 56% (11520/20570) Updating files: 57% (11725/20570) Updating files: 58% (11931/20570) Updating files: 59% (12137/20570) Updating files: 60% (12342/20570) Updating files: 61% (12548/20570) Updating files: 62% (12754/20570) Updating files: 63% (12960/20570) Updating files: 64% (13165/20570) Updating files: 65% (13371/20570) Updating files: 66% (13577/20570) Updating files: 67% (13782/20570) Updating files: 68% (13988/20570) Updating files: 69% (14194/20570) Updating files: 70% (14399/20570) Updating files: 71% (14605/20570) Updating files: 72% (14811/20570) Updating files: 73% (15017/20570) Updating files: 74% (15222/20570) Updating files: 74% (15411/20570) Updating files: 75% (15428/20570) Updating files: 76% (15634/20570) Updating files: 77% (15839/20570) Updating files: 78% (16045/20570) Updating files: 79% (16251/20570) Updating files: 80% (16456/20570) Updating files: 81% (16662/20570) Updating files: 82% (16868/20570) Updating files: 83% (17074/20570) Updating files: 84% (17279/20570) Updating files: 85% (17485/20570) Updating files: 86% (17691/20570) Updating files: 87% (17896/20570) Updating files: 88% (18102/20570) Updating files: 89% (18308/20570) Updating files: 90% (18513/20570) Updating files: 91% (18719/20570) Updating files: 92% (18925/20570) Updating files: 93% (19131/20570) Updating files: 94% (19336/20570) Updating files: 95% (19542/20570) Updating files: 96% (19748/20570) Updating files: 97% (19953/20570) Updating files: 98% (20159/20570) Updating files: 99% (20365/20570) Updating files: 100% (20570/20570) Updating files: 100% (20570/20570), done. From https://github.com/greencapitaltrade/bifrost * [new ref] refs/pull/588/head -> PR-588 Switched to branch 'PR-588' HEAD is now at ad027ad3 Merge remote-tracking branch 'origin/main' into codex/pr-588 checked out revision: refs/pull/588/head:PR-588@ad027ad31d76b2a45c51ba5865d38a50e3fd5128 to dir: source Showing logs for build greencapitaltrade/bifrost/pr-588 #4 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:a45a0bf7790c2738fd6e0d7ce7343b72a2b78943,588:ad027ad31d76b2a45c51ba5865d38a50e3fd5128:refs/pull/588/head using base branch main and base sha a45a0bf7790c2738fd6e0d7ce7343b72a2b78943 merging sha: ad027ad31d76b2a45c51ba5865d38a50e3fd5128 error: error during merge: merging ad027ad31d76b2a45c51ba5865d38a50e3fd5128 into main: failed to run 'git merge ad027ad31d76b2a45c51ba5865d38a50e3fd5128' command in directory '.', output: 'Auto-merging addons/asset_management/tests/test_iot_data_last_gps_guard.py CONFLICT (content): Merge conflict in addons/asset_management/tests/test_iot_data_last_gps_guard.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.