Showing logs for build greencapitaltrade/destiny/pr-1220 #3 stage from-build-pack and container prepare 2026/06/16 06:43:08 Entrypoint initialization Showing logs for build greencapitaltrade/destiny/pr-1220 #3 stage from-build-pack and container place-scripts 2026/06/16 06:43:12 Decoded script /tekton/scripts/script-0-x484j 2026/06/16 06:43:12 Decoded script /tekton/scripts/script-1-b8r86 2026/06/16 06:43:12 Decoded script /tekton/scripts/script-2-vfvqg 2026/06/16 06:43:12 Decoded script /tekton/scripts/script-3-jt6ph 2026/06/16 06:43:12 Decoded script /tekton/scripts/script-4-24769 2026/06/16 06:43:12 Decoded script /tekton/scripts/script-5-fwz4w 2026/06/16 06:43:12 Decoded script /tekton/scripts/script-6-rjldr 2026/06/16 06:43:12 Decoded script /tekton/scripts/script-7-hwtff 2026/06/16 06:43:12 Decoded script /tekton/scripts/script-8-cbzjp Showing logs for build greencapitaltrade/destiny/pr-1220 #3 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/destiny/pr-1220 #3 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/destiny.git version refs/pull/1220/head:PR-1220@5bb80bfc0c6bf79dad7829d723dc7adf5eda67a4 to dir: source Cloning into 'source'... Updating files: 84% (372/442) Updating files: 85% (376/442) Updating files: 86% (381/442) Updating files: 87% (385/442) Updating files: 88% (389/442) Updating files: 89% (394/442) Updating files: 90% (398/442) Updating files: 91% (403/442) Updating files: 92% (407/442) Updating files: 93% (412/442) Updating files: 94% (416/442) Updating files: 95% (420/442) Updating files: 96% (425/442) Updating files: 97% (429/442) Updating files: 98% (434/442) Updating files: 99% (438/442) Updating files: 100% (442/442) Updating files: 100% (442/442), done. From https://github.com/greencapitaltrade/destiny * [new ref] refs/pull/1220/head -> PR-1220 Switched to branch 'PR-1220' HEAD is now at 5bb80bfc Merge pull request #1234 from greencapitaltrade/jarvis/issue-1175 checked out revision: refs/pull/1220/head:PR-1220@5bb80bfc0c6bf79dad7829d723dc7adf5eda67a4 to dir: source Showing logs for build greencapitaltrade/destiny/pr-1220 #3 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:9bb8cf5d8defcbc59904bf6c87c4379235513744,1220:5bb80bfc0c6bf79dad7829d723dc7adf5eda67a4:refs/pull/1220/head using base branch main and base sha 9bb8cf5d8defcbc59904bf6c87c4379235513744 merging sha: 5bb80bfc0c6bf79dad7829d723dc7adf5eda67a4 error: error during merge: merging 5bb80bfc0c6bf79dad7829d723dc7adf5eda67a4 into main: failed to run 'git merge 5bb80bfc0c6bf79dad7829d723dc7adf5eda67a4' command in directory '.', output: 'Auto-merging JARVIS_TECH_CONTRACT.md CONFLICT (add/add): Merge conflict in JARVIS_TECH_CONTRACT.md 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.