Showing logs for build greencapitaltrade/ironman/pr-1330 #2 stage from-build-pack and container prepare 2026/04/17 08:57:25 Entrypoint initialization Showing logs for build greencapitaltrade/ironman/pr-1330 #2 stage from-build-pack and container place-scripts 2026/04/17 08:57:26 Decoded script /tekton/scripts/script-0-qwgcg 2026/04/17 08:57:26 Decoded script /tekton/scripts/script-1-88r2d 2026/04/17 08:57:26 Decoded script /tekton/scripts/script-2-8dcr9 2026/04/17 08:57:26 Decoded script /tekton/scripts/script-3-jphkh 2026/04/17 08:57:26 Decoded script /tekton/scripts/script-4-rf4lt 2026/04/17 08:57:26 Decoded script /tekton/scripts/script-5-2n94k 2026/04/17 08:57:26 Decoded script /tekton/scripts/script-7-pwnll 2026/04/17 08:57:26 Decoded script /tekton/scripts/script-8-s5dqs 2026/04/17 08:57:26 Decoded script /tekton/scripts/script-9-4f9k4 Showing logs for build greencapitaltrade/ironman/pr-1330 #2 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/ironman/pr-1330 #2 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/ironman.git version refs/pull/1330/head:PR-1330@69fbffb5454d8fb7d22880cb2090e640c7272369 to dir: source Cloning into 'source'... From https://github.com/greencapitaltrade/ironman * [new ref] refs/pull/1330/head -> PR-1330 Switched to branch 'PR-1330' HEAD is now at 69fbffb5 fix(preview): pass tolerations+affinity to KafkaNodePool pods + deleteClaim true checked out revision: refs/pull/1330/head:PR-1330@69fbffb5454d8fb7d22880cb2090e640c7272369 to dir: source Showing logs for build greencapitaltrade/ironman/pr-1330 #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,1330:69fbffb5454d8fb7d22880cb2090e640c7272369:refs/pull/1330/head using base branch main and base sha f65592a131733b37e4a64ee55336d61951c9a6f1 merging sha: 69fbffb5454d8fb7d22880cb2090e640c7272369 error: error during merge: merging 69fbffb5454d8fb7d22880cb2090e640c7272369 into main: failed to run 'git merge 69fbffb5454d8fb7d22880cb2090e640c7272369' command in directory '.', output: 'Auto-merging .devcontainer/docker-compose.yml CONFLICT (content): Merge conflict in .devcontainer/docker-compose.yml Auto-merging app.js CONFLICT (content): Merge conflict in app.js Auto-merging charts/ironman/templates/secret.yaml CONFLICT (content): Merge conflict in charts/ironman/templates/secret.yaml Auto-merging charts/ironman/values.yaml CONFLICT (content): Merge conflict in charts/ironman/values.yaml Auto-merging models/account.js Auto-merging models/expense.js Auto-merging models/index.js CONFLICT (content): Merge conflict in models/index.js Auto-merging models/product.js Auto-merging models/repayment.js Auto-merging models/repayment_datum.js Auto-merging package-lock.json CONFLICT (content): Merge conflict in package-lock.json Auto-merging package.json CONFLICT (content): Merge conflict in package.json Auto-merging preview/helmfile.yaml.gotmpl CONFLICT (add/add): Merge conflict in preview/helmfile.yaml.gotmpl Auto-merging preview/kafka-cluster/templates/kafka-cluster.yaml CONFLICT (add/add): Merge conflict in preview/kafka-cluster/templates/kafka-cluster.yaml Auto-merging preview/kafka-cluster/values.yaml CONFLICT (add/add): Merge conflict in preview/kafka-cluster/values.yaml Auto-merging preview/values.yaml.gotmpl Auto-merging queue/consume.js Auto-merging routes/accounts.js Auto-merging tests/integration/accounts.test.js Auto-merging tests/integration/expenses.test.js Auto-merging tests/integration/repayment_data.test.js Auto-merging tests/integration/repayments.test.js Auto-merging tests/unit/consume.test.js CONFLICT (add/add): Merge conflict in tests/unit/consume.test.js Auto-merging transaction/transaction_history.js CONFLICT (content): Merge conflict in transaction/transaction_history.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.