Showing logs for build greencapitaltrade/bifrost/pr-840 #1 stage from-build-pack and container prepare 2026/11/14 12:48:46 Entrypoint initialization Showing logs for build greencapitaltrade/bifrost/pr-840 #1 stage from-build-pack and container place-scripts 2026/11/14 12:48:47 Decoded script /tekton/scripts/script-0-tj4sc 2026/11/14 12:48:47 Decoded script /tekton/scripts/script-1-p7pvt 2026/11/14 12:48:47 Decoded script /tekton/scripts/script-2-9thkr 2026/11/14 12:48:47 Decoded script /tekton/scripts/script-3-d2g4t 2026/11/14 12:48:47 Decoded script /tekton/scripts/script-4-czq4z 2026/11/14 12:48:47 Decoded script /tekton/scripts/script-5-8fpbb 2026/11/14 12:48:47 Decoded script /tekton/scripts/script-6-hl2gm 2026/11/14 12:48:47 Decoded script /tekton/scripts/script-8-8pjlw 2026/11/14 12:48:47 Decoded script /tekton/scripts/script-9-lm4qv 2026/11/14 12:48:47 Decoded script /tekton/scripts/script-10-xrdsw Showing logs for build greencapitaltrade/bifrost/pr-840 #1 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/bifrost/pr-840 #1 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/bifrost.git version refs/pull/840/head:PR-840@e17ce3f4f03455fec3b809cfb6d8ed9530c87071 to dir: source Cloning into 'source'... Updating files: 11% (2351/20859) Updating files: 12% (2504/20859) Updating files: 13% (2712/20859) Updating files: 14% (2921/20859) Updating files: 15% (3129/20859) Updating files: 16% (3338/20859) Updating files: 17% (3547/20859) Updating files: 18% (3755/20859) Updating files: 19% (3964/20859) Updating files: 20% (4172/20859) Updating files: 21% (4381/20859) Updating files: 22% (4589/20859) Updating files: 23% (4798/20859) Updating files: 23% (4819/20859) Updating files: 24% (5007/20859) Updating files: 25% (5215/20859) Updating files: 26% (5424/20859) Updating files: 27% (5632/20859) Updating files: 28% (5841/20859) Updating files: 29% (6050/20859) Updating files: 30% (6258/20859) Updating files: 31% (6467/20859) Updating files: 32% (6675/20859) Updating files: 33% (6884/20859) Updating files: 34% (7093/20859) Updating files: 35% (7301/20859) Updating files: 35% (7500/20859) Updating files: 36% (7510/20859) Updating files: 37% (7718/20859) Updating files: 38% (7927/20859) Updating files: 39% (8136/20859) Updating files: 40% (8344/20859) Updating files: 41% (8553/20859) Updating files: 42% (8761/20859) Updating files: 43% (8970/20859) Updating files: 44% (9178/20859) Updating files: 45% (9387/20859) Updating files: 46% (9596/20859) Updating files: 46% (9706/20859) Updating files: 47% (9804/20859) Updating files: 48% (10013/20859) Updating files: 49% (10221/20859) Updating files: 50% (10430/20859) Updating files: 51% (10639/20859) Updating files: 52% (10847/20859) Updating files: 53% (11056/20859) Updating files: 54% (11264/20859) Updating files: 55% (11473/20859) Updating files: 56% (11682/20859) Updating files: 57% (11890/20859) Updating files: 58% (12099/20859) Updating files: 59% (12307/20859) Updating files: 60% (12516/20859) Updating files: 60% (12570/20859) Updating files: 61% (12724/20859) Updating files: 62% (12933/20859) Updating files: 63% (13142/20859) Updating files: 64% (13350/20859) Updating files: 65% (13559/20859) Updating files: 66% (13767/20859) Updating files: 67% (13976/20859) Updating files: 68% (14185/20859) Updating files: 69% (14393/20859) Updating files: 70% (14602/20859) Updating files: 71% (14810/20859) Updating files: 72% (15019/20859) Updating files: 73% (15228/20859) Updating files: 73% (15348/20859) Updating files: 74% (15436/20859) Updating files: 75% (15645/20859) Updating files: 76% (15853/20859) Updating files: 77% (16062/20859) Updating files: 78% (16271/20859) Updating files: 79% (16479/20859) Updating files: 80% (16688/20859) Updating files: 81% (16896/20859) Updating files: 82% (17105/20859) Updating files: 83% (17313/20859) Updating files: 84% (17522/20859) Updating files: 85% (17731/20859) Updating files: 86% (17939/20859) Updating files: 87% (18148/20859) Updating files: 88% (18356/20859) Updating files: 89% (18565/20859) Updating files: 89% (18631/20859) Updating files: 90% (18774/20859) Updating files: 91% (18982/20859) Updating files: 92% (19191/20859) Updating files: 93% (19399/20859) Updating files: 94% (19608/20859) Updating files: 95% (19817/20859) Updating files: 96% (20025/20859) Updating files: 97% (20234/20859) Updating files: 98% (20442/20859) Updating files: 99% (20651/20859) Updating files: 100% (20859/20859) Updating files: 100% (20859/20859), done. From https://github.com/greencapitaltrade/bifrost * [new ref] refs/pull/840/head -> PR-840 Switched to branch 'PR-840' HEAD is now at e17ce3f4f feat: preserve device-reported SIM login identity checked out revision: refs/pull/840/head:PR-840@e17ce3f4f03455fec3b809cfb6d8ed9530c87071 to dir: source Showing logs for build greencapitaltrade/bifrost/pr-840 #1 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:ce0e36b2798f17ebe2641027e5ab41d5858c3470,840:e17ce3f4f03455fec3b809cfb6d8ed9530c87071:refs/pull/840/head using base branch main and base sha ce0e36b2798f17ebe2641027e5ab41d5858c3470 merging sha: e17ce3f4f03455fec3b809cfb6d8ed9530c87071 error: error during merge: merging e17ce3f4f03455fec3b809cfb6d8ed9530c87071 into main: failed to run 'git merge e17ce3f4f03455fec3b809cfb6d8ed9530c87071' 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/models/__init__.py CONFLICT (content): Merge conflict in addons/asset_management/models/__init__.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.