Showing logs for build greencapitaltrade/destiny/pr-1228 #54 stage from-build-pack and container prepare 2026/06/21 20:31:33 Entrypoint initialization Showing logs for build greencapitaltrade/destiny/pr-1228 #54 stage from-build-pack and container place-scripts 2026/06/21 20:31:35 Decoded script /tekton/scripts/script-0-b2wxd 2026/06/21 20:31:35 Decoded script /tekton/scripts/script-1-4hm44 2026/06/21 20:31:35 Decoded script /tekton/scripts/script-2-xwj2s 2026/06/21 20:31:35 Decoded script /tekton/scripts/script-3-r6wkc 2026/06/21 20:31:35 Decoded script /tekton/scripts/script-4-4f2dj 2026/06/21 20:31:35 Decoded script /tekton/scripts/script-5-j2r7v 2026/06/21 20:31:35 Decoded script /tekton/scripts/script-6-k9pfh 2026/06/21 20:31:35 Decoded script /tekton/scripts/script-7-cqkkp 2026/06/21 20:31:35 Decoded script /tekton/scripts/script-8-t4tr4 Showing logs for build greencapitaltrade/destiny/pr-1228 #54 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/destiny/pr-1228 #54 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@f2df9b4fd7a5d3577d68982b4388b486a463bfcc 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 f2df9b4f fix: revert to standard koa-router path syntax and narrow attribute whitelist checked out revision: refs/pull/1228/head:PR-1228@f2df9b4fd7a5d3577d68982b4388b486a463bfcc to dir: source Showing logs for build greencapitaltrade/destiny/pr-1228 #54 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:f2df9b4fd7a5d3577d68982b4388b486a463bfcc:refs/pull/1228/head using base branch main and base sha 480039b5c71ddad1a34137b568c92f5a0e8b8d7f merging sha: f2df9b4fd7a5d3577d68982b4388b486a463bfcc error: error during merge: merging f2df9b4fd7a5d3577d68982b4388b486a463bfcc into main: failed to run 'git merge f2df9b4fd7a5d3577d68982b4388b486a463bfcc' 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.