Showing logs for build greencapitaltrade/ironman/pr-1355 #4 stage from-build-pack and container prepare
2026/06/05 19:19:28 Entrypoint initialization

Showing logs for build greencapitaltrade/ironman/pr-1355 #4 stage from-build-pack and container place-scripts
2026/06/05 19:19:29 Decoded script /tekton/scripts/script-0-24hsn
2026/06/05 19:19:29 Decoded script /tekton/scripts/script-1-8qgt2
2026/06/05 19:19:29 Decoded script /tekton/scripts/script-2-tmtpb
2026/06/05 19:19:29 Decoded script /tekton/scripts/script-3-zjs5n
2026/06/05 19:19:29 Decoded script /tekton/scripts/script-4-59482
2026/06/05 19:19:29 Decoded script /tekton/scripts/script-5-hz2tw
2026/06/05 19:19:29 Decoded script /tekton/scripts/script-7-tcrvb
2026/06/05 19:19:29 Decoded script /tekton/scripts/script-8-t6qm9
2026/06/05 19:19:29 Decoded script /tekton/scripts/script-9-fvk4g

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

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

Showing logs for build greencapitaltrade/ironman/pr-1355 #4 stage from-build-pack and container step-git-merge
setup git user  email jenkins-x@googlegroups.com
Using SHAs from PULL_REFS=main:150df21939a1cd80d58fdcdc3d21fbbfae93d777,1355:67af7a39c509be77019967e142688e7bb7e8c5e3:refs/pull/1355/head
using base branch main and base sha 150df21939a1cd80d58fdcdc3d21fbbfae93d777
merging sha: 67af7a39c509be77019967e142688e7bb7e8c5e3
error: error during merge: merging 67af7a39c509be77019967e142688e7bb7e8c5e3 into main: failed to run 'git merge 67af7a39c509be77019967e142688e7bb7e8c5e3' 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 preview/redis/values.yaml
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.