Showing logs for build greencapitaltrade/destiny/pr-1228 #50 stage from-build-pack and container prepare 2026/06/21 19:25:18 Entrypoint initialization Showing logs for build greencapitaltrade/destiny/pr-1228 #50 stage from-build-pack and container place-scripts 2026/06/21 19:25:18 Decoded script /tekton/scripts/script-0-67blz 2026/06/21 19:25:18 Decoded script /tekton/scripts/script-1-rw89c 2026/06/21 19:25:18 Decoded script /tekton/scripts/script-2-lq9nh 2026/06/21 19:25:18 Decoded script /tekton/scripts/script-3-ngfk7 2026/06/21 19:25:18 Decoded script /tekton/scripts/script-4-pd78b 2026/06/21 19:25:18 Decoded script /tekton/scripts/script-5-c48cr 2026/06/21 19:25:18 Decoded script /tekton/scripts/script-6-7cdq8 2026/06/21 19:25:18 Decoded script /tekton/scripts/script-7-twgdw 2026/06/21 19:25:18 Decoded script /tekton/scripts/script-8-f62b8 Showing logs for build greencapitaltrade/destiny/pr-1228 #50 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/destiny/pr-1228 #50 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@942c0b4a798e5f84a231d195b4a308ef0fe6027d 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 942c0b4a fix: remove x-gct-file-id header fallback from middlewares per human feedback checked out revision: refs/pull/1228/head:PR-1228@942c0b4a798e5f84a231d195b4a308ef0fe6027d to dir: source Showing logs for build greencapitaltrade/destiny/pr-1228 #50 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:942c0b4a798e5f84a231d195b4a308ef0fe6027d:refs/pull/1228/head using base branch main and base sha 480039b5c71ddad1a34137b568c92f5a0e8b8d7f merging sha: 942c0b4a798e5f84a231d195b4a308ef0fe6027d error: error during merge: merging 942c0b4a798e5f84a231d195b4a308ef0fe6027d into main: failed to run 'git merge 942c0b4a798e5f84a231d195b4a308ef0fe6027d' 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.