Showing logs for build greencapitaltrade/ironman/pr-1344 #1 stage from-build-pack and container prepare
2026/04/20 08:51:03 Entrypoint initialization

Showing logs for build greencapitaltrade/ironman/pr-1344 #1 stage from-build-pack and container place-scripts
2026/04/20 08:51:08 Decoded script /tekton/scripts/script-0-g5mjr
2026/04/20 08:51:08 Decoded script /tekton/scripts/script-1-2dv8z
2026/04/20 08:51:08 Decoded script /tekton/scripts/script-2-nkh94
2026/04/20 08:51:08 Decoded script /tekton/scripts/script-3-tbp9r
2026/04/20 08:51:08 Decoded script /tekton/scripts/script-4-sct5h
2026/04/20 08:51:08 Decoded script /tekton/scripts/script-5-mp4f5
2026/04/20 08:51:08 Decoded script /tekton/scripts/script-7-dh82j
2026/04/20 08:51:08 Decoded script /tekton/scripts/script-8-g8szs
2026/04/20 08:51:08 Decoded script /tekton/scripts/script-9-xwp7c

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

Showing logs for build greencapitaltrade/ironman/pr-1344 #1 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@76ec8fa2e97bb7cdefd62de60b11adf8c69fcc29 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 76ec8fa2 fix: update resource requests for production scaling
checked out revision: refs/pull/1344/head:PR-1344@76ec8fa2e97bb7cdefd62de60b11adf8c69fcc29 to dir: source

Showing logs for build greencapitaltrade/ironman/pr-1344 #1 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:76ec8fa2e97bb7cdefd62de60b11adf8c69fcc29:refs/pull/1344/head
using base branch main and base sha f65592a131733b37e4a64ee55336d61951c9a6f1
merging sha: 76ec8fa2e97bb7cdefd62de60b11adf8c69fcc29
error: error during merge: merging 76ec8fa2e97bb7cdefd62de60b11adf8c69fcc29 into main: failed to run 'git merge 76ec8fa2e97bb7cdefd62de60b11adf8c69fcc29' 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 76ec8fa2e97bb7cdefd62de60b11adf8c69fcc29.  Version 76ec8fa2e97bb7cdefd62de60b11adf8c69fcc29 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.