Showing logs for build greencapitaltrade/heimdallr/pr-152 #2 stage from-build-pack and container prepare 2026/05/04 11:20:36 Entrypoint initialization Showing logs for build greencapitaltrade/heimdallr/pr-152 #2 stage from-build-pack and container place-scripts 2026/05/04 11:20:43 Decoded script /tekton/scripts/script-0-wmdnc 2026/05/04 11:20:43 Decoded script /tekton/scripts/script-1-8wqbv 2026/05/04 11:20:43 Decoded script /tekton/scripts/script-2-htdc8 2026/05/04 11:20:43 Decoded script /tekton/scripts/script-3-6kscp 2026/05/04 11:20:43 Decoded script /tekton/scripts/script-4-x6h8q 2026/05/04 11:20:43 Decoded script /tekton/scripts/script-5-qq9h6 2026/05/04 11:20:43 Decoded script /tekton/scripts/script-7-hmfqn 2026/05/04 11:20:43 Decoded script /tekton/scripts/script-8-chpg7 Showing logs for build greencapitaltrade/heimdallr/pr-152 #2 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/heimdallr/pr-152 #2 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/heimdallr.git version refs/pull/152/head:PR-152@0e6ea5c3ce49ec32f085a4acbae7027cd8bf4709 to dir: source Cloning into 'source'... From https://github.com/greencapitaltrade/heimdallr * [new ref] refs/pull/152/head -> PR-152 Switched to branch 'PR-152' HEAD is now at 0e6ea5c perf: run GeoIP lookup concurrently with auth processing checked out revision: refs/pull/152/head:PR-152@0e6ea5c3ce49ec32f085a4acbae7027cd8bf4709 to dir: source Showing logs for build greencapitaltrade/heimdallr/pr-152 #2 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:87178185fd1f91b2505f3bca5402789097606508,152:0e6ea5c3ce49ec32f085a4acbae7027cd8bf4709:refs/pull/152/head using base branch main and base sha 87178185fd1f91b2505f3bca5402789097606508 merging sha: 0e6ea5c3ce49ec32f085a4acbae7027cd8bf4709 error: error during merge: merging 0e6ea5c3ce49ec32f085a4acbae7027cd8bf4709 into main: failed to run 'git merge 0e6ea5c3ce49ec32f085a4acbae7027cd8bf4709' command in directory '.', output: 'Auto-merging go.mod CONFLICT (content): Merge conflict in go.mod 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.