Showing logs for build greencapitaltrade/destiny/pr-1228 #58 stage from-build-pack and container prepare 2026/06/22 07:10:19 Entrypoint initialization Showing logs for build greencapitaltrade/destiny/pr-1228 #58 stage from-build-pack and container place-scripts 2026/06/22 07:10:24 Decoded script /tekton/scripts/script-0-7hvql 2026/06/22 07:10:24 Decoded script /tekton/scripts/script-1-zpwmp 2026/06/22 07:10:24 Decoded script /tekton/scripts/script-2-l2n7m 2026/06/22 07:10:24 Decoded script /tekton/scripts/script-3-2b75t 2026/06/22 07:10:24 Decoded script /tekton/scripts/script-4-2b8lq 2026/06/22 07:10:24 Decoded script /tekton/scripts/script-5-7kn4w 2026/06/22 07:10:24 Decoded script /tekton/scripts/script-6-bwnw5 2026/06/22 07:10:24 Decoded script /tekton/scripts/script-7-zb4m5 2026/06/22 07:10:24 Decoded script /tekton/scripts/script-8-cvmzj Showing logs for build greencapitaltrade/destiny/pr-1228 #58 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/destiny/pr-1228 #58 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@4e96e5e62b9a0572ff34026dfbd45ea593009654 to dir: source Cloning into 'source'... Updating files: 79% (390/492) Updating files: 80% (394/492) Updating files: 81% (399/492) Updating files: 82% (404/492) Updating files: 83% (409/492) Updating files: 84% (414/492) Updating files: 85% (419/492) Updating files: 86% (424/492) Updating files: 87% (429/492) Updating files: 88% (433/492) Updating files: 89% (438/492) Updating files: 90% (443/492) Updating files: 91% (448/492) Updating files: 92% (453/492) Updating files: 93% (458/492) Updating files: 94% (463/492) Updating files: 95% (468/492) Updating files: 96% (473/492) Updating files: 97% (478/492) Updating files: 98% (483/492) Updating files: 99% (488/492) Updating files: 100% (492/492) Updating files: 100% (492/492), done. From https://github.com/greencapitaltrade/destiny * [new ref] refs/pull/1228/head -> PR-1228 Switched to branch 'PR-1228' HEAD is now at 4e96e5e6 fix: restore x-gct-file-id fallback, validate uuid, align not-owner to 403 checked out revision: refs/pull/1228/head:PR-1228@4e96e5e62b9a0572ff34026dfbd45ea593009654 to dir: source Showing logs for build greencapitaltrade/destiny/pr-1228 #58 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:4e96e5e62b9a0572ff34026dfbd45ea593009654:refs/pull/1228/head using base branch main and base sha 480039b5c71ddad1a34137b568c92f5a0e8b8d7f merging sha: 4e96e5e62b9a0572ff34026dfbd45ea593009654 error: error during merge: merging 4e96e5e62b9a0572ff34026dfbd45ea593009654 into main: failed to run 'git merge 4e96e5e62b9a0572ff34026dfbd45ea593009654' 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.