Showing logs for build greencapitaltrade/destiny/pr-1198 #13 stage from-build-pack and container prepare 2026/06/19 21:50:21 Entrypoint initialization Showing logs for build greencapitaltrade/destiny/pr-1198 #13 stage from-build-pack and container place-scripts 2026/06/19 21:50:22 Decoded script /tekton/scripts/script-0-2hlv8 2026/06/19 21:50:22 Decoded script /tekton/scripts/script-1-hzk8h 2026/06/19 21:50:22 Decoded script /tekton/scripts/script-2-7rwpk 2026/06/19 21:50:22 Decoded script /tekton/scripts/script-3-mf86t 2026/06/19 21:50:22 Decoded script /tekton/scripts/script-4-7s7vv 2026/06/19 21:50:22 Decoded script /tekton/scripts/script-5-fkzdk 2026/06/19 21:50:22 Decoded script /tekton/scripts/script-6-5qgm9 2026/06/19 21:50:22 Decoded script /tekton/scripts/script-7-hz6d4 2026/06/19 21:50:22 Decoded script /tekton/scripts/script-8-qnq26 Showing logs for build greencapitaltrade/destiny/pr-1198 #13 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/destiny/pr-1198 #13 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@617fed8aa19fb9aa90f78cd0c55c13daf3640aef to dir: source Cloning into 'source'... Updating files: 79% (385/482) Updating files: 80% (386/482) Updating files: 81% (391/482) Updating files: 82% (396/482) Updating files: 83% (401/482) Updating files: 84% (405/482) Updating files: 85% (410/482) Updating files: 86% (415/482) Updating files: 87% (420/482) Updating files: 88% (425/482) Updating files: 89% (429/482) Updating files: 90% (434/482) Updating files: 91% (439/482) Updating files: 92% (444/482) Updating files: 93% (449/482) Updating files: 94% (454/482) Updating files: 95% (458/482) Updating files: 96% (463/482) Updating files: 97% (468/482) Updating files: 98% (473/482) Updating files: 99% (478/482) Updating files: 100% (482/482) Updating files: 100% (482/482), done. From https://github.com/greencapitaltrade/destiny * [new ref] refs/pull/1198/head -> PR-1198 Switched to branch 'PR-1198' HEAD is now at 617fed8a fix(ci): add Jest test reporting and align npm install with thor checked out revision: refs/pull/1198/head:PR-1198@617fed8aa19fb9aa90f78cd0c55c13daf3640aef to dir: source Showing logs for build greencapitaltrade/destiny/pr-1198 #13 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:cfc958b4a1b4fd02251fc41486894a2f975c3f71,1198:617fed8aa19fb9aa90f78cd0c55c13daf3640aef:refs/pull/1198/head using base branch main and base sha cfc958b4a1b4fd02251fc41486894a2f975c3f71 merging sha: 617fed8aa19fb9aa90f78cd0c55c13daf3640aef error: error during merge: merging 617fed8aa19fb9aa90f78cd0c55c13daf3640aef into main: failed to run 'git merge 617fed8aa19fb9aa90f78cd0c55c13daf3640aef' command in directory '.', output: 'Auto-merging .lighthouse/jenkins-x/pullrequest.yaml Auto-merging helpers/agreement_renderer.js CONFLICT (add/add): Merge conflict in helpers/agreement_renderer.js Auto-merging jest.config.js CONFLICT (add/add): Merge conflict in jest.config.js Auto-merging models/agreement.js CONFLICT (content): Merge conflict in models/agreement.js Auto-merging models/agreement_template.js CONFLICT (content): Merge conflict in models/agreement_template.js Auto-merging preview/values.yaml.gotmpl CONFLICT (content): Merge conflict in preview/values.yaml.gotmpl Auto-merging tests/unit/agreement_renderer.test.js CONFLICT (add/add): Merge conflict in tests/unit/agreement_renderer.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.