Showing logs for build greencapitaltrade/destiny/pr-1220 #4 stage from-build-pack and container prepare
2026/06/17 13:33:07 Entrypoint initialization

Showing logs for build greencapitaltrade/destiny/pr-1220 #4 stage from-build-pack and container place-scripts
2026/06/17 13:33:08 Decoded script /tekton/scripts/script-0-2j9cw
2026/06/17 13:33:08 Decoded script /tekton/scripts/script-1-69ddn
2026/06/17 13:33:08 Decoded script /tekton/scripts/script-2-j846l
2026/06/17 13:33:08 Decoded script /tekton/scripts/script-3-nv59t
2026/06/17 13:33:08 Decoded script /tekton/scripts/script-4-mwqxs
2026/06/17 13:33:08 Decoded script /tekton/scripts/script-5-rst82
2026/06/17 13:33:08 Decoded script /tekton/scripts/script-6-g5b4x
2026/06/17 13:33:08 Decoded script /tekton/scripts/script-7-dtptz
2026/06/17 13:33:08 Decoded script /tekton/scripts/script-8-qlgrq

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

Showing logs for build greencapitaltrade/destiny/pr-1220 #4 stage from-build-pack and container step-git-clone
git cloning url: https://github.com/greencapitaltrade/destiny.git version refs/pull/1220/head:PR-1220@5bb80bfc0c6bf79dad7829d723dc7adf5eda67a4 to dir: source
Cloning into 'source'...
From https://github.com/greencapitaltrade/destiny
 * [new ref]           refs/pull/1220/head -> PR-1220
Switched to branch 'PR-1220'
HEAD is now at 5bb80bfc Merge pull request #1234 from greencapitaltrade/jarvis/issue-1175
checked out revision: refs/pull/1220/head:PR-1220@5bb80bfc0c6bf79dad7829d723dc7adf5eda67a4 to dir: source

Showing logs for build greencapitaltrade/destiny/pr-1220 #4 stage from-build-pack and container step-git-merge
setup git user  email jenkins-x@googlegroups.com
Using SHAs from PULL_REFS=main:7be18336420a031a4321a1989c83516a73ef9647,1220:5bb80bfc0c6bf79dad7829d723dc7adf5eda67a4:refs/pull/1220/head
using base branch main and base sha 7be18336420a031a4321a1989c83516a73ef9647
merging sha: 5bb80bfc0c6bf79dad7829d723dc7adf5eda67a4
error: error during merge: merging 5bb80bfc0c6bf79dad7829d723dc7adf5eda67a4 into main: failed to run 'git merge 5bb80bfc0c6bf79dad7829d723dc7adf5eda67a4' command in directory '.', output: 'Auto-merging JARVIS_TECH_CONTRACT.md
CONFLICT (add/add): Merge conflict in JARVIS_TECH_CONTRACT.md
Auto-merging migrations/20260615174312-harden-sanctions-terms.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.