Showing logs for build greencapitaltrade/destiny/pr-1270 #3 stage from-build-pack and container prepare
2026/06/21 17:11:37 Entrypoint initialization

Showing logs for build greencapitaltrade/destiny/pr-1270 #3 stage from-build-pack and container place-scripts
2026/06/21 17:11:37 Decoded script /tekton/scripts/script-0-gw97b
2026/06/21 17:11:37 Decoded script /tekton/scripts/script-1-swrvf
2026/06/21 17:11:37 Decoded script /tekton/scripts/script-2-522lz
2026/06/21 17:11:37 Decoded script /tekton/scripts/script-3-llghr
2026/06/21 17:11:37 Decoded script /tekton/scripts/script-4-jzcl5
2026/06/21 17:11:37 Decoded script /tekton/scripts/script-5-rz5fx
2026/06/21 17:11:37 Decoded script /tekton/scripts/script-6-xbtm6
2026/06/21 17:11:37 Decoded script /tekton/scripts/script-7-5qf82
2026/06/21 17:11:37 Decoded script /tekton/scripts/script-8-945zv

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

Showing logs for build greencapitaltrade/destiny/pr-1270 #3 stage from-build-pack and container step-git-clone
git cloning url: https://github.com/greencapitaltrade/destiny.git version refs/pull/1270/head:PR-1270@6b1d7773a166b11385c013b7a4ef1ef36d849b30 to dir: source
Cloning into 'source'...
From https://github.com/greencapitaltrade/destiny
 * [new ref]           refs/pull/1270/head -> PR-1270
Switched to branch 'PR-1270'
HEAD is now at 6b1d7773 fix(destiny): remove unreachable null-check in preview route
checked out revision: refs/pull/1270/head:PR-1270@6b1d7773a166b11385c013b7a4ef1ef36d849b30 to dir: source

Showing logs for build greencapitaltrade/destiny/pr-1270 #3 stage from-build-pack and container step-git-merge
setup git user  email jenkins-x@googlegroups.com
Using SHAs from PULL_REFS=main:480039b5c71ddad1a34137b568c92f5a0e8b8d7f,1270:6b1d7773a166b11385c013b7a4ef1ef36d849b30:refs/pull/1270/head
using base branch main and base sha 480039b5c71ddad1a34137b568c92f5a0e8b8d7f
merging sha: 6b1d7773a166b11385c013b7a4ef1ef36d849b30
error: error during merge: merging 6b1d7773a166b11385c013b7a4ef1ef36d849b30 into main: failed to run 'git merge 6b1d7773a166b11385c013b7a4ef1ef36d849b30' command in directory '.', output: 'Auto-merging routes/agreements.js
CONFLICT (content): Merge conflict in routes/agreements.js
Auto-merging tests/unit/agreement_preview_route.test.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.