Showing logs for build greencapitaltrade/ironman/pr-1323 #1 stage from-build-pack and container prepare 2026/02/17 10:49:46 Entrypoint initialization Showing logs for build greencapitaltrade/ironman/pr-1323 #1 stage from-build-pack and container place-scripts 2026/02/17 10:49:51 Decoded script /tekton/scripts/script-0-lbd7j 2026/02/17 10:49:51 Decoded script /tekton/scripts/script-1-bsngk 2026/02/17 10:49:51 Decoded script /tekton/scripts/script-2-g6qz7 2026/02/17 10:49:51 Decoded script /tekton/scripts/script-3-ntn77 2026/02/17 10:49:51 Decoded script /tekton/scripts/script-4-jjbnl 2026/02/17 10:49:51 Decoded script /tekton/scripts/script-5-ptz7p 2026/02/17 10:49:51 Decoded script /tekton/scripts/script-7-55wg7 2026/02/17 10:49:51 Decoded script /tekton/scripts/script-8-q292j 2026/02/17 10:49:51 Decoded script /tekton/scripts/script-9-phm6n Showing logs for build greencapitaltrade/ironman/pr-1323 #1 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/ironman/pr-1323 #1 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@a818d707d8a0dcd9a5ed78314485295a60ca2945 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 a818d707 chore: upgrade node from 18/19 to 22 checked out revision: refs/pull/1323/head:PR-1323@a818d707d8a0dcd9a5ed78314485295a60ca2945 to dir: source Showing logs for build greencapitaltrade/ironman/pr-1323 #1 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:a818d707d8a0dcd9a5ed78314485295a60ca2945:refs/pull/1323/head using base branch main and base sha 7538b36c244f1a6d93d0845ed5672777c0c38861 merging sha: a818d707d8a0dcd9a5ed78314485295a60ca2945 error: error during merge: merging a818d707d8a0dcd9a5ed78314485295a60ca2945 into main: failed to run 'git merge a818d707d8a0dcd9a5ed78314485295a60ca2945' 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.