Showing logs for build greencapitaltrade/fury/pr-1949 #5 stage from-build-pack and container prepare
2026/05/23 09:28:40 Entrypoint initialization

Showing logs for build greencapitaltrade/fury/pr-1949 #5 stage from-build-pack and container place-scripts
2026/05/23 09:28:40 Decoded script /tekton/scripts/script-0-2dhhl
2026/05/23 09:28:40 Decoded script /tekton/scripts/script-1-n8wqs
2026/05/23 09:28:40 Decoded script /tekton/scripts/script-2-5db22
2026/05/23 09:28:40 Decoded script /tekton/scripts/script-3-tqwf4
2026/05/23 09:28:40 Decoded script /tekton/scripts/script-4-k2qbp
2026/05/23 09:28:40 Decoded script /tekton/scripts/script-5-cdptk
2026/05/23 09:28:40 Decoded script /tekton/scripts/script-6-8nf97
2026/05/23 09:28:40 Decoded script /tekton/scripts/script-8-4r9sl
2026/05/23 09:28:40 Decoded script /tekton/scripts/script-9-xx4zr

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

Showing logs for build greencapitaltrade/fury/pr-1949 #5 stage from-build-pack and container step-git-clone
git cloning url: https://github.com/greencapitaltrade/fury.git version refs/pull/1949/head:PR-1949@aab4727e9df8e7d6a05b3346db69917ce0f6f1f4 to dir: source
Cloning into 'source'...
From https://github.com/greencapitaltrade/fury
 * [new ref]           refs/pull/1949/head -> PR-1949
Switched to branch 'PR-1949'
HEAD is now at aab4727e chore: prettier auto-format
checked out revision: refs/pull/1949/head:PR-1949@aab4727e9df8e7d6a05b3346db69917ce0f6f1f4 to dir: source

Showing logs for build greencapitaltrade/fury/pr-1949 #5 stage from-build-pack and container step-git-merge
setup git user  email jenkins-x@googlegroups.com
Using SHAs from PULL_REFS=main:0f2f96a5a4e14aaeeccb31916f10bb9011edc158,1949:aab4727e9df8e7d6a05b3346db69917ce0f6f1f4:refs/pull/1949/head
using base branch main and base sha 0f2f96a5a4e14aaeeccb31916f10bb9011edc158
merging sha: aab4727e9df8e7d6a05b3346db69917ce0f6f1f4
error: error during merge: merging aab4727e9df8e7d6a05b3346db69917ce0f6f1f4 into main: failed to run 'git merge aab4727e9df8e7d6a05b3346db69917ce0f6f1f4' command in directory '.', output: 'Auto-merging schema.graphql
Auto-merging src/schema/asset/query.ts
Auto-merging src/schema/asset/resolvers/assets.ts
Auto-merging src/schema/asset/resolvers/teams.ts
CONFLICT (content): Merge conflict in src/schema/asset/resolvers/teams.ts
Auto-merging src/utils/bifrost-client.ts
CONFLICT (content): Merge conflict in src/utils/bifrost-client.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.