Showing logs for build greencapitaltrade/ironman/pr-1323 #4 stage from-build-pack and container prepare 2026/02/17 19:02:54 Entrypoint initialization Showing logs for build greencapitaltrade/ironman/pr-1323 #4 stage from-build-pack and container place-scripts 2026/02/17 19:02:55 Decoded script /tekton/scripts/script-0-sf4wt 2026/02/17 19:02:55 Decoded script /tekton/scripts/script-1-l78t2 2026/02/17 19:02:55 Decoded script /tekton/scripts/script-2-88rq2 2026/02/17 19:02:55 Decoded script /tekton/scripts/script-3-bjmxm 2026/02/17 19:02:55 Decoded script /tekton/scripts/script-4-dwwqq 2026/02/17 19:02:56 Decoded script /tekton/scripts/script-5-nxgrf 2026/02/17 19:02:56 Decoded script /tekton/scripts/script-7-qpthp 2026/02/17 19:02:56 Decoded script /tekton/scripts/script-8-n4zgz 2026/02/17 19:02:56 Decoded script /tekton/scripts/script-9-fnmgk Showing logs for build greencapitaltrade/ironman/pr-1323 #4 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/ironman/pr-1323 #4 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/ironman.git version refs/pull/1323/head:PR-1323@67cbcc6ba77da2b47beb731aff0eafe2280b56aa to dir: source Cloning into 'source'... From https://github.com/greencapitaltrade/ironman * [new ref] refs/pull/1323/head -> PR-1323 Switched to branch 'PR-1323' HEAD is now at 67cbcc6b chore: replace RabbitMQ with Kafka in Helm charts and preview env checked out revision: refs/pull/1323/head:PR-1323@67cbcc6ba77da2b47beb731aff0eafe2280b56aa to dir: source Showing logs for build greencapitaltrade/ironman/pr-1323 #4 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:7538b36c244f1a6d93d0845ed5672777c0c38861,1323:67cbcc6ba77da2b47beb731aff0eafe2280b56aa:refs/pull/1323/head using base branch main and base sha 7538b36c244f1a6d93d0845ed5672777c0c38861 merging sha: 67cbcc6ba77da2b47beb731aff0eafe2280b56aa error: error during merge: merging 67cbcc6ba77da2b47beb731aff0eafe2280b56aa into main: failed to run 'git merge 67cbcc6ba77da2b47beb731aff0eafe2280b56aa' command in directory '.', output: 'Auto-merging app.js Auto-merging models/index.js CONFLICT (content): Merge conflict in models/index.js Auto-merging models/product_lender.js Auto-merging models/product_user.js CONFLICT (add/add): Merge conflict in models/product_user.js Auto-merging package-lock.json Auto-merging routes/products.js CONFLICT (add/add): Merge conflict in routes/products.js Auto-merging routes/repayments.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.