Showing logs for build greencapitaltrade/destiny/pr-1228 #53 stage from-build-pack and container prepare 2026/06/21 20:16:51 Entrypoint initialization Showing logs for build greencapitaltrade/destiny/pr-1228 #53 stage from-build-pack and container place-scripts 2026/06/21 20:16:52 Decoded script /tekton/scripts/script-0-n2gdc 2026/06/21 20:16:52 Decoded script /tekton/scripts/script-1-mrvg4 2026/06/21 20:16:52 Decoded script /tekton/scripts/script-2-zvd9k 2026/06/21 20:16:52 Decoded script /tekton/scripts/script-3-z2qd8 2026/06/21 20:16:52 Decoded script /tekton/scripts/script-4-w9l9j 2026/06/21 20:16:52 Decoded script /tekton/scripts/script-5-k7xp4 2026/06/21 20:16:52 Decoded script /tekton/scripts/script-6-xw9nh 2026/06/21 20:16:52 Decoded script /tekton/scripts/script-7-brqvh 2026/06/21 20:16:52 Decoded script /tekton/scripts/script-8-552kt Showing logs for build greencapitaltrade/destiny/pr-1228 #53 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/destiny/pr-1228 #53 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@1b5b5971098ddb62ced95c6a4323625860b3dc66 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 1b5b5971 fix: use consistent route mount syntax for application_id param checked out revision: refs/pull/1228/head:PR-1228@1b5b5971098ddb62ced95c6a4323625860b3dc66 to dir: source Showing logs for build greencapitaltrade/destiny/pr-1228 #53 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:1b5b5971098ddb62ced95c6a4323625860b3dc66:refs/pull/1228/head using base branch main and base sha 480039b5c71ddad1a34137b568c92f5a0e8b8d7f merging sha: 1b5b5971098ddb62ced95c6a4323625860b3dc66 error: error during merge: merging 1b5b5971098ddb62ced95c6a4323625860b3dc66 into main: failed to run 'git merge 1b5b5971098ddb62ced95c6a4323625860b3dc66' 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.