Showing logs for build greencapitaltrade/ironman/pr-1323 #2 stage from-build-pack and container prepare
2026/02/17 14:29:40 Entrypoint initialization

Showing logs for build greencapitaltrade/ironman/pr-1323 #2 stage from-build-pack and container place-scripts
2026/02/17 14:29:42 Decoded script /tekton/scripts/script-0-kwckd
2026/02/17 14:29:42 Decoded script /tekton/scripts/script-1-rqdbq
2026/02/17 14:29:42 Decoded script /tekton/scripts/script-2-jdx6f
2026/02/17 14:29:42 Decoded script /tekton/scripts/script-3-wjpx8
2026/02/17 14:29:42 Decoded script /tekton/scripts/script-4-w2cr4
2026/02/17 14:29:42 Decoded script /tekton/scripts/script-5-nc5cw
2026/02/17 14:29:42 Decoded script /tekton/scripts/script-7-cp6z8
2026/02/17 14:29:42 Decoded script /tekton/scripts/script-8-7z7pw
2026/02/17 14:29:42 Decoded script /tekton/scripts/script-9-w4ms4

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

Showing logs for build greencapitaltrade/ironman/pr-1323 #2 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@971b21271a1dd6dff1e46329063419c5c7000b59 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 971b2127 fix: resolve test failures in kafka migration
checked out revision: refs/pull/1323/head:PR-1323@971b21271a1dd6dff1e46329063419c5c7000b59 to dir: source

Showing logs for build greencapitaltrade/ironman/pr-1323 #2 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:971b21271a1dd6dff1e46329063419c5c7000b59:refs/pull/1323/head
using base branch main and base sha 7538b36c244f1a6d93d0845ed5672777c0c38861
merging sha: 971b21271a1dd6dff1e46329063419c5c7000b59
error: error during merge: merging 971b21271a1dd6dff1e46329063419c5c7000b59 into main: failed to run 'git merge 971b21271a1dd6dff1e46329063419c5c7000b59' 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.