Showing logs for build greencapitaltrade/destiny/pr-1228 #55 stage from-build-pack and container prepare 2026/06/21 20:54:33 Entrypoint initialization Showing logs for build greencapitaltrade/destiny/pr-1228 #55 stage from-build-pack and container place-scripts 2026/06/21 20:54:34 Decoded script /tekton/scripts/script-0-x2nf4 2026/06/21 20:54:34 Decoded script /tekton/scripts/script-1-z8rst 2026/06/21 20:54:34 Decoded script /tekton/scripts/script-2-xlxwz 2026/06/21 20:54:34 Decoded script /tekton/scripts/script-3-t644l 2026/06/21 20:54:34 Decoded script /tekton/scripts/script-4-lt6vn 2026/06/21 20:54:34 Decoded script /tekton/scripts/script-5-whzgl 2026/06/21 20:54:34 Decoded script /tekton/scripts/script-6-98mqz 2026/06/21 20:54:34 Decoded script /tekton/scripts/script-7-smbbc 2026/06/21 20:54:34 Decoded script /tekton/scripts/script-8-mxb7b Showing logs for build greencapitaltrade/destiny/pr-1228 #55 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/destiny/pr-1228 #55 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@5c53418e03977a0dec25f3c399a0e6f7ce89e130 to dir: source Cloning into 'source'... From https://github.com/greencapitaltrade/destiny * [new ref] refs/pull/1228/head -> PR-1228 Switched to branch 'PR-1228' HEAD is now at 5c53418e fix: expect 403 forbidden for cross-org access per human feedback checked out revision: refs/pull/1228/head:PR-1228@5c53418e03977a0dec25f3c399a0e6f7ce89e130 to dir: source Showing logs for build greencapitaltrade/destiny/pr-1228 #55 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:480039b5c71ddad1a34137b568c92f5a0e8b8d7f,1228:5c53418e03977a0dec25f3c399a0e6f7ce89e130:refs/pull/1228/head using base branch main and base sha 480039b5c71ddad1a34137b568c92f5a0e8b8d7f merging sha: 5c53418e03977a0dec25f3c399a0e6f7ce89e130 error: error during merge: merging 5c53418e03977a0dec25f3c399a0e6f7ce89e130 into main: failed to run 'git merge 5c53418e03977a0dec25f3c399a0e6f7ce89e130' 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.