Showing logs for build greencapitaltrade/ironman/pr-1344 #2 stage from-build-pack and container prepare 2026/04/21 10:16:51 Entrypoint initialization Showing logs for build greencapitaltrade/ironman/pr-1344 #2 stage from-build-pack and container place-scripts 2026/04/21 10:16:56 Decoded script /tekton/scripts/script-0-vh54r 2026/04/21 10:16:56 Decoded script /tekton/scripts/script-1-kvdb9 2026/04/21 10:16:56 Decoded script /tekton/scripts/script-2-z5n95 2026/04/21 10:16:56 Decoded script /tekton/scripts/script-3-2wfm2 2026/04/21 10:16:56 Decoded script /tekton/scripts/script-4-gr6s8 2026/04/21 10:16:56 Decoded script /tekton/scripts/script-5-tzg5m 2026/04/21 10:16:56 Decoded script /tekton/scripts/script-7-8m24k 2026/04/21 10:16:56 Decoded script /tekton/scripts/script-8-f7bv5 2026/04/21 10:16:56 Decoded script /tekton/scripts/script-9-5m565 Showing logs for build greencapitaltrade/ironman/pr-1344 #2 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/ironman/pr-1344 #2 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/ironman.git version refs/pull/1344/head:PR-1344@ff79b7afa5ffd2fc97e8a04d6f1f2705cee5a1de to dir: source Cloning into 'source'... From https://github.com/greencapitaltrade/ironman * [new ref] refs/pull/1344/head -> PR-1344 Switched to branch 'PR-1344' HEAD is now at ff79b7af fix: update resource requests for production scaling checked out revision: refs/pull/1344/head:PR-1344@ff79b7afa5ffd2fc97e8a04d6f1f2705cee5a1de to dir: source Showing logs for build greencapitaltrade/ironman/pr-1344 #2 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:f65592a131733b37e4a64ee55336d61951c9a6f1,1344:ff79b7afa5ffd2fc97e8a04d6f1f2705cee5a1de:refs/pull/1344/head using base branch main and base sha f65592a131733b37e4a64ee55336d61951c9a6f1 merging sha: ff79b7afa5ffd2fc97e8a04d6f1f2705cee5a1de error: error during merge: merging ff79b7afa5ffd2fc97e8a04d6f1f2705cee5a1de into main: failed to run 'git merge ff79b7afa5ffd2fc97e8a04d6f1f2705cee5a1de' command in directory '.', output: 'Auto-merging app.js Auto-merging charts/ironman/values.yaml CONFLICT (content): Merge conflict in charts/ironman/values.yaml 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 CONFLICT (modify/delete): preview/helmfile.yaml deleted in HEAD and modified in ff79b7afa5ffd2fc97e8a04d6f1f2705cee5a1de. Version ff79b7afa5ffd2fc97e8a04d6f1f2705cee5a1de of preview/helmfile.yaml left in tree. Auto-merging routes/products.js CONFLICT (add/add): Merge conflict in routes/products.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. Showing logs for build greencapitaltrade/ironman/pr-1344 #2 stage from-build-pack and container prepare 2026/04/21 10:16:51 Entrypoint initialization Showing logs for build greencapitaltrade/ironman/pr-1344 #2 stage from-build-pack and container place-scripts 2026/04/21 10:16:56 Decoded script /tekton/scripts/script-0-vh54r 2026/04/21 10:16:56 Decoded script /tekton/scripts/script-1-kvdb9 2026/04/21 10:16:56 Decoded script /tekton/scripts/script-2-z5n95 2026/04/21 10:16:56 Decoded script /tekton/scripts/script-3-2wfm2 2026/04/21 10:16:56 Decoded script /tekton/scripts/script-4-gr6s8 2026/04/21 10:16:56 Decoded script /tekton/scripts/script-5-tzg5m 2026/04/21 10:16:56 Decoded script /tekton/scripts/script-7-8m24k 2026/04/21 10:16:56 Decoded script /tekton/scripts/script-8-f7bv5 2026/04/21 10:16:56 Decoded script /tekton/scripts/script-9-5m565 Showing logs for build greencapitaltrade/ironman/pr-1344 #2 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/ironman/pr-1344 #2 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/ironman.git version refs/pull/1344/head:PR-1344@ff79b7afa5ffd2fc97e8a04d6f1f2705cee5a1de to dir: source Cloning into 'source'... From https://github.com/greencapitaltrade/ironman * [new ref] refs/pull/1344/head -> PR-1344 Switched to branch 'PR-1344' HEAD is now at ff79b7af fix: update resource requests for production scaling checked out revision: refs/pull/1344/head:PR-1344@ff79b7afa5ffd2fc97e8a04d6f1f2705cee5a1de to dir: source Showing logs for build greencapitaltrade/ironman/pr-1344 #2 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:f65592a131733b37e4a64ee55336d61951c9a6f1,1344:ff79b7afa5ffd2fc97e8a04d6f1f2705cee5a1de:refs/pull/1344/head using base branch main and base sha f65592a131733b37e4a64ee55336d61951c9a6f1 merging sha: ff79b7afa5ffd2fc97e8a04d6f1f2705cee5a1de error: error during merge: merging ff79b7afa5ffd2fc97e8a04d6f1f2705cee5a1de into main: failed to run 'git merge ff79b7afa5ffd2fc97e8a04d6f1f2705cee5a1de' command in directory '.', output: 'Auto-merging app.js Auto-merging charts/ironman/values.yaml CONFLICT (content): Merge conflict in charts/ironman/values.yaml 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 CONFLICT (modify/delete): preview/helmfile.yaml deleted in HEAD and modified in ff79b7afa5ffd2fc97e8a04d6f1f2705cee5a1de. Version ff79b7afa5ffd2fc97e8a04d6f1f2705cee5a1de of preview/helmfile.yaml left in tree. Auto-merging routes/products.js CONFLICT (add/add): Merge conflict in routes/products.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. Showing logs for build greencapitaltrade/ironman/pr-1344 #2 stage from-build-pack and container prepare 2026/04/21 10:16:51 Entrypoint initialization Showing logs for build greencapitaltrade/ironman/pr-1344 #2 stage from-build-pack and container place-scripts 2026/04/21 10:16:56 Decoded script /tekton/scripts/script-0-vh54r 2026/04/21 10:16:56 Decoded script /tekton/scripts/script-1-kvdb9 2026/04/21 10:16:56 Decoded script /tekton/scripts/script-2-z5n95 2026/04/21 10:16:56 Decoded script /tekton/scripts/script-3-2wfm2 2026/04/21 10:16:56 Decoded script /tekton/scripts/script-4-gr6s8 2026/04/21 10:16:56 Decoded script /tekton/scripts/script-5-tzg5m 2026/04/21 10:16:56 Decoded script /tekton/scripts/script-7-8m24k 2026/04/21 10:16:56 Decoded script /tekton/scripts/script-8-f7bv5 2026/04/21 10:16:56 Decoded script /tekton/scripts/script-9-5m565 Showing logs for build greencapitaltrade/ironman/pr-1344 #2 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/ironman/pr-1344 #2 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/ironman.git version refs/pull/1344/head:PR-1344@ff79b7afa5ffd2fc97e8a04d6f1f2705cee5a1de to dir: source Cloning into 'source'... From https://github.com/greencapitaltrade/ironman * [new ref] refs/pull/1344/head -> PR-1344 Switched to branch 'PR-1344' HEAD is now at ff79b7af fix: update resource requests for production scaling checked out revision: refs/pull/1344/head:PR-1344@ff79b7afa5ffd2fc97e8a04d6f1f2705cee5a1de to dir: source Showing logs for build greencapitaltrade/ironman/pr-1344 #2 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:f65592a131733b37e4a64ee55336d61951c9a6f1,1344:ff79b7afa5ffd2fc97e8a04d6f1f2705cee5a1de:refs/pull/1344/head using base branch main and base sha f65592a131733b37e4a64ee55336d61951c9a6f1 merging sha: ff79b7afa5ffd2fc97e8a04d6f1f2705cee5a1de error: error during merge: merging ff79b7afa5ffd2fc97e8a04d6f1f2705cee5a1de into main: failed to run 'git merge ff79b7afa5ffd2fc97e8a04d6f1f2705cee5a1de' command in directory '.', output: 'Auto-merging app.js Auto-merging charts/ironman/values.yaml CONFLICT (content): Merge conflict in charts/ironman/values.yaml 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 CONFLICT (modify/delete): preview/helmfile.yaml deleted in HEAD and modified in ff79b7afa5ffd2fc97e8a04d6f1f2705cee5a1de. Version ff79b7afa5ffd2fc97e8a04d6f1f2705cee5a1de of preview/helmfile.yaml left in tree. Auto-merging routes/products.js CONFLICT (add/add): Merge conflict in routes/products.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.