Showing logs for build greencapitaltrade/jarvis/pr-164 #9 stage from-build-pack and container prepare 2026/07/10 16:16:28 Entrypoint initialization Showing logs for build greencapitaltrade/jarvis/pr-164 #9 stage from-build-pack and container place-scripts 2026/07/10 16:16:29 Decoded script /tekton/scripts/script-0-jq5g7 2026/07/10 16:16:29 Decoded script /tekton/scripts/script-1-7znkm 2026/07/10 16:16:29 Decoded script /tekton/scripts/script-2-dvs5m 2026/07/10 16:16:29 Decoded script /tekton/scripts/script-3-ldv4s 2026/07/10 16:16:29 Decoded script /tekton/scripts/script-4-mlmfn 2026/07/10 16:16:29 Decoded script /tekton/scripts/script-5-gppbd Showing logs for build greencapitaltrade/jarvis/pr-164 #9 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/jarvis/pr-164 #9 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/jarvis.git version refs/pull/164/head:PR-164@d54c1399eba546138410ef4f7251c402510f1a87 to dir: source Cloning into 'source'... From https://github.com/greencapitaltrade/jarvis * [new ref] refs/pull/164/head -> PR-164 Switched to branch 'PR-164' HEAD is now at d54c139 fix(docker): install curl before using it to fetch the gh apt keyring checked out revision: refs/pull/164/head:PR-164@d54c1399eba546138410ef4f7251c402510f1a87 to dir: source Showing logs for build greencapitaltrade/jarvis/pr-164 #9 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:f58ebf20484bfdc50f4da4e3ec6aea732f3b0c40,164:d54c1399eba546138410ef4f7251c402510f1a87:refs/pull/164/head using base branch main and base sha f58ebf20484bfdc50f4da4e3ec6aea732f3b0c40 merging sha: d54c1399eba546138410ef4f7251c402510f1a87 error: error during merge: merging d54c1399eba546138410ef4f7251c402510f1a87 into main: failed to run 'git merge d54c1399eba546138410ef4f7251c402510f1a87' command in directory '.', output: 'Auto-merging Dockerfile CONFLICT (content): Merge conflict in Dockerfile 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.