Showing logs for build greencapitaltrade/ironman/pr-1420 #1 stage from-build-pack and container prepare 2026/07/10 12:24:22 Entrypoint initialization Showing logs for build greencapitaltrade/ironman/pr-1420 #1 stage from-build-pack and container place-scripts 2026/07/10 12:24:23 Decoded script /tekton/scripts/script-0-q8dz4 2026/07/10 12:24:23 Decoded script /tekton/scripts/script-1-lwdvl 2026/07/10 12:24:23 Decoded script /tekton/scripts/script-2-6fdvq 2026/07/10 12:24:23 Decoded script /tekton/scripts/script-3-wrkl6 2026/07/10 12:24:23 Decoded script /tekton/scripts/script-4-84g6c 2026/07/10 12:24:23 Decoded script /tekton/scripts/script-5-jdhzm 2026/07/10 12:24:23 Decoded script /tekton/scripts/script-7-wld92 2026/07/10 12:24:23 Decoded script /tekton/scripts/script-8-tgxng 2026/07/10 12:24:23 Decoded script /tekton/scripts/script-9-gkxvw Showing logs for build greencapitaltrade/ironman/pr-1420 #1 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/ironman/pr-1420 #1 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/ironman.git version refs/pull/1420/head:PR-1420@97d5bef54286239e4af45ce163710ef854150b2e to dir: source Cloning into 'source'... From https://github.com/greencapitaltrade/ironman * [new ref] refs/pull/1420/head -> PR-1420 Switched to branch 'PR-1420' HEAD is now at 97d5bef5 test(#1371): add coverage for default and provider persistence checked out revision: refs/pull/1420/head:PR-1420@97d5bef54286239e4af45ce163710ef854150b2e to dir: source Showing logs for build greencapitaltrade/ironman/pr-1420 #1 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:596b94927c4fd01b713933394d11286a0c81e3c6,1420:97d5bef54286239e4af45ce163710ef854150b2e:refs/pull/1420/head using base branch main and base sha 596b94927c4fd01b713933394d11286a0c81e3c6 merging sha: 97d5bef54286239e4af45ce163710ef854150b2e error: error during merge: merging 97d5bef54286239e4af45ce163710ef854150b2e into main: failed to run 'git merge 97d5bef54286239e4af45ce163710ef854150b2e' command in directory '.', output: 'Auto-merging models/bank_account.js CONFLICT (content): Merge conflict in models/bank_account.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.