Showing logs for build greencapitaltrade/destiny/pr-1235 #7 stage from-build-pack and container prepare
2026/06/21 08:22:34 Entrypoint initialization

Showing logs for build greencapitaltrade/destiny/pr-1235 #7 stage from-build-pack and container place-scripts
2026/06/21 08:22:34 Decoded script /tekton/scripts/script-0-sxjgb
2026/06/21 08:22:34 Decoded script /tekton/scripts/script-1-2nrbx
2026/06/21 08:22:34 Decoded script /tekton/scripts/script-2-t8f42
2026/06/21 08:22:34 Decoded script /tekton/scripts/script-3-m2t4g
2026/06/21 08:22:34 Decoded script /tekton/scripts/script-4-722m9
2026/06/21 08:22:34 Decoded script /tekton/scripts/script-5-r6cgh
2026/06/21 08:22:34 Decoded script /tekton/scripts/script-6-dkqmf
2026/06/21 08:22:34 Decoded script /tekton/scripts/script-7-rz528
2026/06/21 08:22:34 Decoded script /tekton/scripts/script-8-w88m2

Showing logs for build greencapitaltrade/destiny/pr-1235 #7 stage from-build-pack and container working-dir-initializer

Showing logs for build greencapitaltrade/destiny/pr-1235 #7 stage from-build-pack and container step-git-clone
git cloning url: https://github.com/greencapitaltrade/destiny.git version refs/pull/1235/head:PR-1235@b6d7558e0ec66c9fc2771210e616581ebc8a0253 to dir: source
Cloning into 'source'...
From https://github.com/greencapitaltrade/destiny
 * [new ref]           refs/pull/1235/head -> PR-1235
Switched to branch 'PR-1235'
HEAD is now at b6d7558e fix: use utils-provided Jest config and add required CI reporter packages
checked out revision: refs/pull/1235/head:PR-1235@b6d7558e0ec66c9fc2771210e616581ebc8a0253 to dir: source

Showing logs for build greencapitaltrade/destiny/pr-1235 #7 stage from-build-pack and container step-git-merge
setup git user  email jenkins-x@googlegroups.com
Using SHAs from PULL_REFS=main:8d8f9b815b1a72020ea044836b2eaa86b6f85c95,1235:b6d7558e0ec66c9fc2771210e616581ebc8a0253:refs/pull/1235/head
using base branch main and base sha 8d8f9b815b1a72020ea044836b2eaa86b6f85c95
merging sha: b6d7558e0ec66c9fc2771210e616581ebc8a0253
error: error during merge: merging b6d7558e0ec66c9fc2771210e616581ebc8a0253 into main: failed to run 'git merge b6d7558e0ec66c9fc2771210e616581ebc8a0253' command in directory '.', output: 'Auto-merging models/integration_credential.js
CONFLICT (content): Merge conflict in models/integration_credential.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.