Showing logs for build greencapitaltrade/destiny/pr-1228 #52 stage from-build-pack and container prepare 2026/06/21 20:07:23 Entrypoint initialization Showing logs for build greencapitaltrade/destiny/pr-1228 #52 stage from-build-pack and container place-scripts 2026/06/21 20:07:23 Decoded script /tekton/scripts/script-0-7x6dm 2026/06/21 20:07:23 Decoded script /tekton/scripts/script-1-p4twb 2026/06/21 20:07:23 Decoded script /tekton/scripts/script-2-tjzjc 2026/06/21 20:07:23 Decoded script /tekton/scripts/script-3-kpbgz 2026/06/21 20:07:23 Decoded script /tekton/scripts/script-4-tx5ts 2026/06/21 20:07:23 Decoded script /tekton/scripts/script-5-w9z7m 2026/06/21 20:07:23 Decoded script /tekton/scripts/script-6-gmlx6 2026/06/21 20:07:23 Decoded script /tekton/scripts/script-7-d4x46 2026/06/21 20:07:23 Decoded script /tekton/scripts/script-8-b8jzc Showing logs for build greencapitaltrade/destiny/pr-1228 #52 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/destiny/pr-1228 #52 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@f818fbda27c05fa8cec826b48203a859688e9c49 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 f818fbda fix: make application_id param required in bank_statements mount checked out revision: refs/pull/1228/head:PR-1228@f818fbda27c05fa8cec826b48203a859688e9c49 to dir: source Showing logs for build greencapitaltrade/destiny/pr-1228 #52 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:f818fbda27c05fa8cec826b48203a859688e9c49:refs/pull/1228/head using base branch main and base sha 480039b5c71ddad1a34137b568c92f5a0e8b8d7f merging sha: f818fbda27c05fa8cec826b48203a859688e9c49 error: error during merge: merging f818fbda27c05fa8cec826b48203a859688e9c49 into main: failed to run 'git merge f818fbda27c05fa8cec826b48203a859688e9c49' 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.