Showing logs for build greencapitaltrade/ironman/pr-1406 #6 stage from-build-pack and container prepare
2026/06/28 15:01:31 Entrypoint initialization

Showing logs for build greencapitaltrade/ironman/pr-1406 #6 stage from-build-pack and container place-scripts
2026/06/28 15:01:32 Decoded script /tekton/scripts/script-0-55hfr
2026/06/28 15:01:32 Decoded script /tekton/scripts/script-1-c2jlc
2026/06/28 15:01:32 Decoded script /tekton/scripts/script-2-njhx9
2026/06/28 15:01:32 Decoded script /tekton/scripts/script-3-8hnpr
2026/06/28 15:01:32 Decoded script /tekton/scripts/script-4-dfc8c
2026/06/28 15:01:32 Decoded script /tekton/scripts/script-5-s9j2h
2026/06/28 15:01:32 Decoded script /tekton/scripts/script-7-gp6xz
2026/06/28 15:01:32 Decoded script /tekton/scripts/script-8-dzjbf
2026/06/28 15:01:32 Decoded script /tekton/scripts/script-9-76k5c

Showing logs for build greencapitaltrade/ironman/pr-1406 #6 stage from-build-pack and container working-dir-initializer

Showing logs for build greencapitaltrade/ironman/pr-1406 #6 stage from-build-pack and container step-git-clone
git cloning url: https://github.com/greencapitaltrade/ironman.git version refs/pull/1406/head:PR-1406@7691b93df65f803596203f1f7f949ce880dfcac3 to dir: source
Cloning into 'source'...
From https://github.com/greencapitaltrade/ironman
 * [new ref]           refs/pull/1406/head -> PR-1406
Switched to branch 'PR-1406'
HEAD is now at 7691b93d fix(ci): reduce stepTemplate resource requests to 100m/256Mi
checked out revision: refs/pull/1406/head:PR-1406@7691b93df65f803596203f1f7f949ce880dfcac3 to dir: source

Showing logs for build greencapitaltrade/ironman/pr-1406 #6 stage from-build-pack and container step-git-merge
setup git user  email jenkins-x@googlegroups.com
Using SHAs from PULL_REFS=main:613e998380bcac838de3a271d6a2bde69393a722,1406:7691b93df65f803596203f1f7f949ce880dfcac3:refs/pull/1406/head
using base branch main and base sha 613e998380bcac838de3a271d6a2bde69393a722
merging sha: 7691b93df65f803596203f1f7f949ce880dfcac3
error: error during merge: merging 7691b93df65f803596203f1f7f949ce880dfcac3 into main: failed to run 'git merge 7691b93df65f803596203f1f7f949ce880dfcac3' command in directory '.', output: 'Auto-merging .lighthouse/jenkins-x/pullrequest.yaml
CONFLICT (content): Merge conflict in .lighthouse/jenkins-x/pullrequest.yaml
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
Auto-merging models/repayment.js
Auto-merging queue/consume.js
CONFLICT (content): Merge conflict in queue/consume.js
Auto-merging routes/products.js
CONFLICT (add/add): Merge conflict in routes/products.js
Auto-merging tests/integration/expenses.test.js
Auto-merging tests/integration/payments.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.