Showing logs for build greencapitaltrade/ironman/pr-1328 #3 stage from-build-pack and container prepare
2026/03/20 10:21:00 Entrypoint initialization

Showing logs for build greencapitaltrade/ironman/pr-1328 #3 stage from-build-pack and container place-scripts
2026/03/20 10:21:01 Decoded script /tekton/scripts/script-0-z68j4
2026/03/20 10:21:01 Decoded script /tekton/scripts/script-1-4bmrt
2026/03/20 10:21:01 Decoded script /tekton/scripts/script-2-7qq96
2026/03/20 10:21:01 Decoded script /tekton/scripts/script-3-b2n79
2026/03/20 10:21:01 Decoded script /tekton/scripts/script-4-ntsks
2026/03/20 10:21:01 Decoded script /tekton/scripts/script-5-t2q79
2026/03/20 10:21:01 Decoded script /tekton/scripts/script-7-59czv
2026/03/20 10:21:01 Decoded script /tekton/scripts/script-8-7n54v
2026/03/20 10:21:01 Decoded script /tekton/scripts/script-9-ht2z2

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

Showing logs for build greencapitaltrade/ironman/pr-1328 #3 stage from-build-pack and container step-git-clone
git cloning url: https://github.com/greencapitaltrade/ironman.git version refs/pull/1328/head:PR-1328@82354849fa4a6e2e157140dddd9fb42194463214 to dir: source
Cloning into 'source'...
From https://github.com/greencapitaltrade/ironman
 * [new ref]           refs/pull/1328/head -> PR-1328
Switched to branch 'PR-1328'
HEAD is now at 82354849 ci: retrigger pipeline
checked out revision: refs/pull/1328/head:PR-1328@82354849fa4a6e2e157140dddd9fb42194463214 to dir: source

Showing logs for build greencapitaltrade/ironman/pr-1328 #3 stage from-build-pack and container step-git-merge
setup git user  email jenkins-x@googlegroups.com
Using SHAs from PULL_REFS=main:f65592a131733b37e4a64ee55336d61951c9a6f1,1328:82354849fa4a6e2e157140dddd9fb42194463214:refs/pull/1328/head
using base branch main and base sha f65592a131733b37e4a64ee55336d61951c9a6f1
merging sha: 82354849fa4a6e2e157140dddd9fb42194463214
error: error during merge: merging 82354849fa4a6e2e157140dddd9fb42194463214 into main: failed to run 'git merge 82354849fa4a6e2e157140dddd9fb42194463214' 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
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.