Showing logs for build greencapitaltrade/destiny/pr-1235 #6 stage from-build-pack and container prepare
2026/06/19 21:53:30 Entrypoint initialization

Showing logs for build greencapitaltrade/destiny/pr-1235 #6 stage from-build-pack and container place-scripts
2026/06/19 21:53:31 Decoded script /tekton/scripts/script-0-6b5hw
2026/06/19 21:53:31 Decoded script /tekton/scripts/script-1-vgsb9
2026/06/19 21:53:31 Decoded script /tekton/scripts/script-2-d6zqq
2026/06/19 21:53:31 Decoded script /tekton/scripts/script-3-cbj8k
2026/06/19 21:53:31 Decoded script /tekton/scripts/script-4-5q4l9
2026/06/19 21:53:31 Decoded script /tekton/scripts/script-5-qbhbv
2026/06/19 21:53:31 Decoded script /tekton/scripts/script-6-r92h2
2026/06/19 21:53:31 Decoded script /tekton/scripts/script-7-gx2vd
2026/06/19 21:53:31 Decoded script /tekton/scripts/script-8-dq6h6

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

Showing logs for build greencapitaltrade/destiny/pr-1235 #6 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@7dd5546915a6a31e97f100e22d2db104d031c4b9 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 7dd55469 fix: use utils-provided Jest config and add required CI reporter packages
checked out revision: refs/pull/1235/head:PR-1235@7dd5546915a6a31e97f100e22d2db104d031c4b9 to dir: source

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