Showing logs for build greencapitaltrade/fury/pr-2258 #1 stage from-build-pack and container prepare
2026/10/31 07:54:25 Entrypoint initialization

Showing logs for build greencapitaltrade/fury/pr-2258 #1 stage from-build-pack and container place-scripts
2026/10/31 07:54:26 Decoded script /tekton/scripts/script-0-7cnjm
2026/10/31 07:54:26 Decoded script /tekton/scripts/script-1-kgctr
2026/10/31 07:54:26 Decoded script /tekton/scripts/script-2-mqgbp
2026/10/31 07:54:26 Decoded script /tekton/scripts/script-3-cvvbz
2026/10/31 07:54:26 Decoded script /tekton/scripts/script-4-nzz2w
2026/10/31 07:54:26 Decoded script /tekton/scripts/script-5-tc2sb
2026/10/31 07:54:26 Decoded script /tekton/scripts/script-6-nv94t
2026/10/31 07:54:26 Decoded script /tekton/scripts/script-7-l8ln6
2026/10/31 07:54:26 Decoded script /tekton/scripts/script-9-nckd9
2026/10/31 07:54:26 Decoded script /tekton/scripts/script-10-jzrwh

Showing logs for build greencapitaltrade/fury/pr-2258 #1 stage from-build-pack and container working-dir-initializer

Showing logs for build greencapitaltrade/fury/pr-2258 #1 stage from-build-pack and container step-git-clone
git cloning url: https://github.com/greencapitaltrade/fury.git version refs/pull/2258/head:PR-2258@22019c678c879f9a78fe3e9fc8a7e219246acce4 to dir: source
Cloning into 'source'...
From https://github.com/greencapitaltrade/fury
 * [new ref]           refs/pull/2258/head -> PR-2258
Switched to branch 'PR-2258'
HEAD is now at 22019c67 fix: scope personal Jobs plans to selected assets
checked out revision: refs/pull/2258/head:PR-2258@22019c678c879f9a78fe3e9fc8a7e219246acce4 to dir: source

Showing logs for build greencapitaltrade/fury/pr-2258 #1 stage from-build-pack and container step-git-merge
setup git user  email jenkins-x@googlegroups.com
Using SHAs from PULL_REFS=main:2f9e484b1b1a4375c87507fc8b572bb27d21fa44,2258:22019c678c879f9a78fe3e9fc8a7e219246acce4:refs/pull/2258/head
using base branch main and base sha 2f9e484b1b1a4375c87507fc8b572bb27d21fa44
merging sha: 22019c678c879f9a78fe3e9fc8a7e219246acce4
error: error during merge: merging 22019c678c879f9a78fe3e9fc8a7e219246acce4 into main: failed to run 'git merge 22019c678c879f9a78fe3e9fc8a7e219246acce4' command in directory '.', output: 'Auto-merging ASSET_MANAGEMENT.md
CONFLICT (content): Merge conflict in ASSET_MANAGEMENT.md
Auto-merging schema.graphql
Auto-merging src/schema/types.ts
CONFLICT (content): Merge conflict in src/schema/types.ts
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.