Showing logs for build greencapitaltrade/destiny/pr-1173 #8 stage from-build-pack and container prepare 2026/06/15 21:21:58 Entrypoint initialization Showing logs for build greencapitaltrade/destiny/pr-1173 #8 stage from-build-pack and container place-scripts 2026/06/15 21:21:59 Decoded script /tekton/scripts/script-0-2ctl9 2026/06/15 21:21:59 Decoded script /tekton/scripts/script-1-hsxfk 2026/06/15 21:21:59 Decoded script /tekton/scripts/script-2-5wwct 2026/06/15 21:21:59 Decoded script /tekton/scripts/script-3-j2rxt 2026/06/15 21:21:59 Decoded script /tekton/scripts/script-4-v7npn 2026/06/15 21:21:59 Decoded script /tekton/scripts/script-5-ncndb 2026/06/15 21:21:59 Decoded script /tekton/scripts/script-6-qtdq4 2026/06/15 21:21:59 Decoded script /tekton/scripts/script-7-mt9z5 2026/06/15 21:21:59 Decoded script /tekton/scripts/script-8-s4x7l Showing logs for build greencapitaltrade/destiny/pr-1173 #8 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/destiny/pr-1173 #8 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/destiny.git version refs/pull/1173/head:PR-1173@9a195fdaf85b63feb5331462b75c2d7c63eacfb4 to dir: source Cloning into 'source'... Updating files: 84% (372/442) Updating files: 85% (376/442) Updating files: 86% (381/442) Updating files: 87% (385/442) Updating files: 88% (389/442) Updating files: 89% (394/442) Updating files: 90% (398/442) Updating files: 91% (403/442) Updating files: 92% (407/442) Updating files: 93% (412/442) Updating files: 94% (416/442) Updating files: 95% (420/442) Updating files: 96% (425/442) Updating files: 97% (429/442) Updating files: 98% (434/442) Updating files: 99% (438/442) Updating files: 100% (442/442) Updating files: 100% (442/442), done. From https://github.com/greencapitaltrade/destiny * [new ref] refs/pull/1173/head -> PR-1173 Switched to branch 'PR-1173' HEAD is now at 9a195fda fix(bank-statement): make detectSalary use txnTimestamp ?? date fallback checked out revision: refs/pull/1173/head:PR-1173@9a195fdaf85b63feb5331462b75c2d7c63eacfb4 to dir: source Showing logs for build greencapitaltrade/destiny/pr-1173 #8 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:9bb8cf5d8defcbc59904bf6c87c4379235513744,1173:9a195fdaf85b63feb5331462b75c2d7c63eacfb4:refs/pull/1173/head using base branch main and base sha 9bb8cf5d8defcbc59904bf6c87c4379235513744 merging sha: 9a195fdaf85b63feb5331462b75c2d7c63eacfb4 error: error during merge: merging 9a195fdaf85b63feb5331462b75c2d7c63eacfb4 into main: failed to run 'git merge 9a195fdaf85b63feb5331462b75c2d7c63eacfb4' command in directory '.', output: 'Auto-merging models/bank_statement.js Auto-merging routes/bank_statements.js CONFLICT (content): Merge conflict in routes/bank_statements.js Auto-merging routes/statements.js CONFLICT (content): Merge conflict in routes/statements.js Auto-merging tests/unit/statement.test.js CONFLICT (content): Merge conflict in tests/unit/statement.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.