Showing logs for build greencapitaltrade/destiny/pr-1198 #9 stage from-build-pack and container prepare 2026/06/17 14:48:46 Entrypoint initialization Showing logs for build greencapitaltrade/destiny/pr-1198 #9 stage from-build-pack and container place-scripts 2026/06/17 14:48:47 Decoded script /tekton/scripts/script-0-p2pn2 2026/06/17 14:48:47 Decoded script /tekton/scripts/script-1-pbklq 2026/06/17 14:48:47 Decoded script /tekton/scripts/script-2-8782k 2026/06/17 14:48:47 Decoded script /tekton/scripts/script-3-vd6lz 2026/06/17 14:48:47 Decoded script /tekton/scripts/script-4-nfz8x 2026/06/17 14:48:47 Decoded script /tekton/scripts/script-5-kkm5h 2026/06/17 14:48:47 Decoded script /tekton/scripts/script-6-j722r 2026/06/17 14:48:47 Decoded script /tekton/scripts/script-7-c4dzm 2026/06/17 14:48:47 Decoded script /tekton/scripts/script-8-gngwt Showing logs for build greencapitaltrade/destiny/pr-1198 #9 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/destiny/pr-1198 #9 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/destiny.git version refs/pull/1198/head:PR-1198@4f480c7c8ac3c7f8fa431aeba34ebeb8ca9705bb to dir: source Cloning into 'source'... Updating files: 82% (375/456) Updating files: 83% (379/456) Updating files: 84% (384/456) Updating files: 85% (388/456) Updating files: 86% (393/456) Updating files: 87% (397/456) Updating files: 88% (402/456) Updating files: 89% (406/456) Updating files: 90% (411/456) Updating files: 91% (415/456) Updating files: 92% (420/456) Updating files: 93% (425/456) Updating files: 94% (429/456) Updating files: 95% (434/456) Updating files: 96% (438/456) Updating files: 97% (443/456) Updating files: 98% (447/456) Updating files: 99% (452/456) Updating files: 100% (456/456) Updating files: 100% (456/456), done. From https://github.com/greencapitaltrade/destiny * [new ref] refs/pull/1198/head -> PR-1198 Switched to branch 'PR-1198' HEAD is now at 4f480c7c fix(ci): revert out-of-scope pipeline changes and fix jest config checked out revision: refs/pull/1198/head:PR-1198@4f480c7c8ac3c7f8fa431aeba34ebeb8ca9705bb to dir: source Showing logs for build greencapitaltrade/destiny/pr-1198 #9 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:4a6358642d3fcef03b2a77615f684686e75496d5,1198:4f480c7c8ac3c7f8fa431aeba34ebeb8ca9705bb:refs/pull/1198/head using base branch main and base sha 4a6358642d3fcef03b2a77615f684686e75496d5 merging sha: 4f480c7c8ac3c7f8fa431aeba34ebeb8ca9705bb error: error during merge: merging 4f480c7c8ac3c7f8fa431aeba34ebeb8ca9705bb into main: failed to run 'git merge 4f480c7c8ac3c7f8fa431aeba34ebeb8ca9705bb' command in directory '.', output: 'Auto-merging jest.config.js CONFLICT (add/add): Merge conflict in jest.config.js Auto-merging package.json 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.