Showing logs for build greencapitaltrade/fury/pr-2049 #2 stage from-build-pack and container prepare
2026/08/08 14:00:43 Entrypoint initialization

Showing logs for build greencapitaltrade/fury/pr-2049 #2 stage from-build-pack and container place-scripts
2026/08/08 14:00:44 Decoded script /tekton/scripts/script-0-dhldr
2026/08/08 14:00:44 Decoded script /tekton/scripts/script-1-c2dst
2026/08/08 14:00:44 Decoded script /tekton/scripts/script-2-r7c2p
2026/08/08 14:00:44 Decoded script /tekton/scripts/script-3-72c7g
2026/08/08 14:00:44 Decoded script /tekton/scripts/script-4-s6fzm
2026/08/08 14:00:44 Decoded script /tekton/scripts/script-5-t9fwp
2026/08/08 14:00:44 Decoded script /tekton/scripts/script-6-rckp5
2026/08/08 14:00:44 Decoded script /tekton/scripts/script-8-wnq4d
2026/08/08 14:00:44 Decoded script /tekton/scripts/script-9-gt7ls

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

Showing logs for build greencapitaltrade/fury/pr-2049 #2 stage from-build-pack and container step-git-clone
git cloning url: https://github.com/greencapitaltrade/fury.git version refs/pull/2049/head:PR-2049@ef772acc649930f235439ba043b58649e47201d4 to dir: source
Cloning into 'source'...
From https://github.com/greencapitaltrade/fury
 * [new ref]           refs/pull/2049/head -> PR-2049
Switched to branch 'PR-2049'
HEAD is now at ef772acc Merge branch 'jarvis/feature-2017' into jarvis/issue-2044
checked out revision: refs/pull/2049/head:PR-2049@ef772acc649930f235439ba043b58649e47201d4 to dir: source

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