Showing logs for build greencapitaltrade/destiny/pr-1250 #11 stage from-build-pack and container prepare
2026/06/19 21:14:25 Entrypoint initialization

Showing logs for build greencapitaltrade/destiny/pr-1250 #11 stage from-build-pack and container place-scripts
2026/06/19 21:14:26 Decoded script /tekton/scripts/script-0-bcscp
2026/06/19 21:14:26 Decoded script /tekton/scripts/script-1-tc6vc
2026/06/19 21:14:26 Decoded script /tekton/scripts/script-2-4xfnr
2026/06/19 21:14:26 Decoded script /tekton/scripts/script-3-7vz5m
2026/06/19 21:14:26 Decoded script /tekton/scripts/script-4-dbq9w
2026/06/19 21:14:26 Decoded script /tekton/scripts/script-5-7kh4b
2026/06/19 21:14:26 Decoded script /tekton/scripts/script-6-d6df2
2026/06/19 21:14:26 Decoded script /tekton/scripts/script-7-dt6mc
2026/06/19 21:14:26 Decoded script /tekton/scripts/script-8-6fg9z

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

Showing logs for build greencapitaltrade/destiny/pr-1250 #11 stage from-build-pack and container step-git-clone
git cloning url: https://github.com/greencapitaltrade/destiny.git version refs/pull/1250/head:PR-1250@12e4ae365a522c7ee8e55d8cde18cff7738a7d21 to dir: source
Cloning into 'source'...
From https://github.com/greencapitaltrade/destiny
 * [new ref]           refs/pull/1250/head -> PR-1250
Switched to branch 'PR-1250'
HEAD is now at 12e4ae36 style: run prettier on saafe_callback test
checked out revision: refs/pull/1250/head:PR-1250@12e4ae365a522c7ee8e55d8cde18cff7738a7d21 to dir: source

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