Showing logs for build greencapitaltrade/ironman/pr-1324 #2 stage from-build-pack and container prepare 2026/02/28 18:50:21 Entrypoint initialization Showing logs for build greencapitaltrade/ironman/pr-1324 #2 stage from-build-pack and container place-scripts 2026/02/28 18:50:21 Decoded script /tekton/scripts/script-0-gsqfc 2026/02/28 18:50:21 Decoded script /tekton/scripts/script-1-7gvrj 2026/02/28 18:50:22 Decoded script /tekton/scripts/script-2-6rd8w 2026/02/28 18:50:22 Decoded script /tekton/scripts/script-3-jhgv6 2026/02/28 18:50:22 Decoded script /tekton/scripts/script-4-7t28x 2026/02/28 18:50:22 Decoded script /tekton/scripts/script-5-tdnhx 2026/02/28 18:50:22 Decoded script /tekton/scripts/script-7-7xntz 2026/02/28 18:50:22 Decoded script /tekton/scripts/script-8-5bgw2 2026/02/28 18:50:22 Decoded script /tekton/scripts/script-9-m5gpp Showing logs for build greencapitaltrade/ironman/pr-1324 #2 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/ironman/pr-1324 #2 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/ironman.git version refs/pull/1324/head:PR-1324@1f42a91e75d134628251c24d3247c4cbc9e6b327 to dir: source Cloning into 'source'... From https://github.com/greencapitaltrade/ironman * [new ref] refs/pull/1324/head -> PR-1324 Switched to branch 'PR-1324' HEAD is now at 1f42a91e fix: update resource requests for production scaling checked out revision: refs/pull/1324/head:PR-1324@1f42a91e75d134628251c24d3247c4cbc9e6b327 to dir: source Showing logs for build greencapitaltrade/ironman/pr-1324 #2 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:7d82bf838dc15d057f66c451953d92b15800ab1b,1324:1f42a91e75d134628251c24d3247c4cbc9e6b327:refs/pull/1324/head using base branch main and base sha 7d82bf838dc15d057f66c451953d92b15800ab1b merging sha: 1f42a91e75d134628251c24d3247c4cbc9e6b327 error: error during merge: merging 1f42a91e75d134628251c24d3247c4cbc9e6b327 into main: failed to run 'git merge 1f42a91e75d134628251c24d3247c4cbc9e6b327' command in directory '.', output: 'Auto-merging models/index.js CONFLICT (content): Merge conflict in models/index.js Auto-merging preview/kafka-cluster/values.yaml CONFLICT (add/add): Merge conflict in preview/kafka-cluster/values.yaml 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.