Showing logs for build greencapitaltrade/destiny/pr-1224 #23 stage from-build-pack and container prepare 2026/06/19 15:02:44 Entrypoint initialization Showing logs for build greencapitaltrade/destiny/pr-1224 #23 stage from-build-pack and container place-scripts 2026/06/19 15:03:01 Decoded script /tekton/scripts/script-0-97z4r 2026/06/19 15:03:01 Decoded script /tekton/scripts/script-1-79jz2 2026/06/19 15:03:01 Decoded script /tekton/scripts/script-2-gb6kq 2026/06/19 15:03:01 Decoded script /tekton/scripts/script-3-pb574 2026/06/19 15:03:01 Decoded script /tekton/scripts/script-4-v76dx 2026/06/19 15:03:01 Decoded script /tekton/scripts/script-5-z5jk4 2026/06/19 15:03:01 Decoded script /tekton/scripts/script-6-j5fbq 2026/06/19 15:03:01 Decoded script /tekton/scripts/script-7-tsx4x 2026/06/19 15:03:01 Decoded script /tekton/scripts/script-8-n6vjc Showing logs for build greencapitaltrade/destiny/pr-1224 #23 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/destiny/pr-1224 #23 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/destiny.git version refs/pull/1224/head:PR-1224@a659d8b898dcff57102f53dc87df9e79b99dc0f4 to dir: source Cloning into 'source'... Updating files: 80% (380/475) Updating files: 81% (385/475) Updating files: 82% (390/475) Updating files: 83% (395/475) Updating files: 84% (399/475) Updating files: 85% (404/475) Updating files: 86% (409/475) Updating files: 87% (414/475) Updating files: 88% (418/475) Updating files: 89% (423/475) Updating files: 90% (428/475) Updating files: 91% (433/475) Updating files: 92% (437/475) Updating files: 93% (442/475) Updating files: 94% (447/475) Updating files: 95% (452/475) Updating files: 96% (456/475) Updating files: 97% (461/475) Updating files: 98% (466/475) Updating files: 99% (471/475) Updating files: 100% (475/475) Updating files: 100% (475/475), done. From https://github.com/greencapitaltrade/destiny * [new ref] refs/pull/1224/head -> PR-1224 Switched to branch 'PR-1224' HEAD is now at a659d8b8 fix: remove flaky timing assertion from emit_event test checked out revision: refs/pull/1224/head:PR-1224@a659d8b898dcff57102f53dc87df9e79b99dc0f4 to dir: source Showing logs for build greencapitaltrade/destiny/pr-1224 #23 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:6209893cb4ac76691caae3c490662e4f2c2e84a2,1224:a659d8b898dcff57102f53dc87df9e79b99dc0f4:refs/pull/1224/head using base branch main and base sha 6209893cb4ac76691caae3c490662e4f2c2e84a2 merging sha: a659d8b898dcff57102f53dc87df9e79b99dc0f4 error: error during merge: merging a659d8b898dcff57102f53dc87df9e79b99dc0f4 into main: failed to run 'git merge a659d8b898dcff57102f53dc87df9e79b99dc0f4' command in directory '.', output: 'Auto-merging app.js Auto-merging routes/applications.js Auto-merging tests/unit/emit_event.test.js CONFLICT (content): Merge conflict in tests/unit/emit_event.test.js 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.