Showing logs for build greencapitaltrade/bifrost/pr-431 #1 stage from-build-pack and container prepare 2026/07/31 07:11:06 Entrypoint initialization Showing logs for build greencapitaltrade/bifrost/pr-431 #1 stage from-build-pack and container place-scripts 2026/07/31 07:11:10 Decoded script /tekton/scripts/script-0-cpwhs 2026/07/31 07:11:10 Decoded script /tekton/scripts/script-1-ljpbx 2026/07/31 07:11:10 Decoded script /tekton/scripts/script-2-672ll 2026/07/31 07:11:10 Decoded script /tekton/scripts/script-3-frwmn 2026/07/31 07:11:10 Decoded script /tekton/scripts/script-4-26mnc 2026/07/31 07:11:10 Decoded script /tekton/scripts/script-5-w9zgw 2026/07/31 07:11:10 Decoded script /tekton/scripts/script-7-wjd26 2026/07/31 07:11:10 Decoded script /tekton/scripts/script-8-cl2jr 2026/07/31 07:11:10 Decoded script /tekton/scripts/script-9-hmmjn Showing logs for build greencapitaltrade/bifrost/pr-431 #1 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/bifrost/pr-431 #1 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/bifrost.git version refs/pull/431/head:PR-431@53d9accbc2a66e4cd1f25c9bd2113214f09b859e to dir: source Cloning into 'source'... Updating files: 21% (4398/20364) Updating files: 22% (4481/20364) Updating files: 23% (4684/20364) Updating files: 24% (4888/20364) Updating files: 25% (5091/20364) Updating files: 26% (5295/20364) Updating files: 27% (5499/20364) Updating files: 28% (5702/20364) Updating files: 29% (5906/20364) Updating files: 30% (6110/20364) Updating files: 31% (6313/20364) Updating files: 32% (6517/20364) Updating files: 33% (6721/20364) Updating files: 34% (6924/20364) Updating files: 35% (7128/20364) Updating files: 36% (7332/20364) Updating files: 37% (7535/20364) Updating files: 38% (7739/20364) Updating files: 39% (7942/20364) Updating files: 40% (8146/20364) Updating files: 40% (8203/20364) Updating files: 41% (8350/20364) Updating files: 42% (8553/20364) Updating files: 43% (8757/20364) Updating files: 44% (8961/20364) Updating files: 45% (9164/20364) Updating files: 46% (9368/20364) Updating files: 47% (9572/20364) Updating files: 48% (9775/20364) Updating files: 49% (9979/20364) Updating files: 50% (10182/20364) Updating files: 51% (10386/20364) Updating files: 52% (10590/20364) Updating files: 53% (10793/20364) Updating files: 54% (10997/20364) Updating files: 55% (11201/20364) Updating files: 56% (11404/20364) Updating files: 57% (11608/20364) Updating files: 58% (11812/20364) Updating files: 59% (12015/20364) Updating files: 60% (12219/20364) Updating files: 61% (12423/20364) Updating files: 62% (12626/20364) Updating files: 63% (12830/20364) Updating files: 64% (13033/20364) Updating files: 65% (13237/20364) Updating files: 66% (13441/20364) Updating files: 66% (13524/20364) Updating files: 67% (13644/20364) Updating files: 68% (13848/20364) Updating files: 69% (14052/20364) Updating files: 70% (14255/20364) Updating files: 71% (14459/20364) Updating files: 72% (14663/20364) Updating files: 73% (14866/20364) Updating files: 74% (15070/20364) Updating files: 75% (15273/20364) Updating files: 76% (15477/20364) Updating files: 77% (15681/20364) Updating files: 78% (15884/20364) Updating files: 79% (16088/20364) Updating files: 80% (16292/20364) Updating files: 81% (16495/20364) Updating files: 82% (16699/20364) Updating files: 83% (16903/20364) Updating files: 84% (17106/20364) Updating files: 85% (17310/20364) Updating files: 86% (17514/20364) Updating files: 87% (17717/20364) Updating files: 88% (17921/20364) Updating files: 89% (18124/20364) Updating files: 90% (18328/20364) Updating files: 90% (18410/20364) Updating files: 91% (18532/20364) Updating files: 92% (18735/20364) Updating files: 93% (18939/20364) Updating files: 94% (19143/20364) Updating files: 95% (19346/20364) Updating files: 96% (19550/20364) Updating files: 97% (19754/20364) Updating files: 98% (19957/20364) Updating files: 99% (20161/20364) Updating files: 100% (20364/20364) Updating files: 100% (20364/20364), done. From https://github.com/greencapitaltrade/bifrost * [new ref] refs/pull/431/head -> PR-431 Switched to branch 'PR-431' HEAD is now at 53d9accb feat(asset): bulk camera scan in the Import Serials/Lots dialog checked out revision: refs/pull/431/head:PR-431@53d9accbc2a66e4cd1f25c9bd2113214f09b859e to dir: source Showing logs for build greencapitaltrade/bifrost/pr-431 #1 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:8ed8506c36902e4ce328f4a82ebc62832127ae8f,431:53d9accbc2a66e4cd1f25c9bd2113214f09b859e:refs/pull/431/head using base branch main and base sha 8ed8506c36902e4ce328f4a82ebc62832127ae8f merging sha: 53d9accbc2a66e4cd1f25c9bd2113214f09b859e error: error during merge: merging 53d9accbc2a66e4cd1f25c9bd2113214f09b859e into main: failed to run 'git merge 53d9accbc2a66e4cd1f25c9bd2113214f09b859e' command in directory '.', output: 'Auto-merging addons/asset_iot_provisioning/__manifest__.py CONFLICT (content): Merge conflict in addons/asset_iot_provisioning/__manifest__.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.