Showing logs for build greencapitaltrade/destiny/pr-1228 #6 stage from-build-pack and container prepare 2026/06/17 13:31:41 Entrypoint initialization Showing logs for build greencapitaltrade/destiny/pr-1228 #6 stage from-build-pack and container place-scripts 2026/06/17 13:31:51 Decoded script /tekton/scripts/script-0-x99q7 2026/06/17 13:31:51 Decoded script /tekton/scripts/script-1-rc87c 2026/06/17 13:31:51 Decoded script /tekton/scripts/script-2-tdfrc 2026/06/17 13:31:51 Decoded script /tekton/scripts/script-3-wj8v9 2026/06/17 13:31:51 Decoded script /tekton/scripts/script-4-zpw2g 2026/06/17 13:31:51 Decoded script /tekton/scripts/script-5-tmvqg 2026/06/17 13:31:51 Decoded script /tekton/scripts/script-6-gmpcg 2026/06/17 13:31:51 Decoded script /tekton/scripts/script-7-bwcp4 2026/06/17 13:31:51 Decoded script /tekton/scripts/script-8-xh9bc Showing logs for build greencapitaltrade/destiny/pr-1228 #6 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/destiny/pr-1228 #6 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/destiny.git version refs/pull/1228/head:PR-1228@45b1e99bf0034c3774b75d663151ffe29f029b9e to dir: source Cloning into 'source'... Updating files: 82% (375/455) Updating files: 83% (378/455) Updating files: 84% (383/455) Updating files: 85% (387/455) Updating files: 86% (392/455) Updating files: 87% (396/455) Updating files: 88% (401/455) Updating files: 89% (405/455) Updating files: 90% (410/455) Updating files: 91% (415/455) Updating files: 92% (419/455) Updating files: 93% (424/455) Updating files: 94% (428/455) Updating files: 95% (433/455) Updating files: 96% (437/455) Updating files: 97% (442/455) Updating files: 98% (446/455) Updating files: 99% (451/455) Updating files: 100% (455/455) Updating files: 100% (455/455), done. From https://github.com/greencapitaltrade/destiny * [new ref] refs/pull/1228/head -> PR-1228 Switched to branch 'PR-1228' HEAD is now at 45b1e99b fix: use consistent org header type in auth bypass test checked out revision: refs/pull/1228/head:PR-1228@45b1e99bf0034c3774b75d663151ffe29f029b9e to dir: source Showing logs for build greencapitaltrade/destiny/pr-1228 #6 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:7be18336420a031a4321a1989c83516a73ef9647,1228:45b1e99bf0034c3774b75d663151ffe29f029b9e:refs/pull/1228/head using base branch main and base sha 7be18336420a031a4321a1989c83516a73ef9647 merging sha: 45b1e99bf0034c3774b75d663151ffe29f029b9e error: error during merge: merging 45b1e99bf0034c3774b75d663151ffe29f029b9e into main: failed to run 'git merge 45b1e99bf0034c3774b75d663151ffe29f029b9e' command in directory '.', output: 'Auto-merging routes/bank_statements.js CONFLICT (content): Merge conflict in routes/bank_statements.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.