Showing logs for build greencapitaltrade/fury/pr-2068 #2 stage from-build-pack and container prepare
2026/06/24 18:13:07 Entrypoint initialization

Showing logs for build greencapitaltrade/fury/pr-2068 #2 stage from-build-pack and container place-scripts
2026/06/24 18:13:08 Decoded script /tekton/scripts/script-0-ccg5q
2026/06/24 18:13:08 Decoded script /tekton/scripts/script-1-84fdk
2026/06/24 18:13:08 Decoded script /tekton/scripts/script-2-w25cc
2026/06/24 18:13:08 Decoded script /tekton/scripts/script-3-plxds
2026/06/24 18:13:08 Decoded script /tekton/scripts/script-4-s6xft
2026/06/24 18:13:08 Decoded script /tekton/scripts/script-5-jfs46
2026/06/24 18:13:08 Decoded script /tekton/scripts/script-6-v7bkx
2026/06/24 18:13:08 Decoded script /tekton/scripts/script-8-wfzrr
2026/06/24 18:13:08 Decoded script /tekton/scripts/script-9-6lr5z

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

Showing logs for build greencapitaltrade/fury/pr-2068 #2 stage from-build-pack and container step-git-clone
git cloning url: https://github.com/greencapitaltrade/fury.git version refs/pull/2068/head:PR-2068@892476a197ab5b59dd1a5349c20fb4331c2a409b to dir: source
Cloning into 'source'...
From https://github.com/greencapitaltrade/fury
 * [new ref]           refs/pull/2068/head -> PR-2068
Switched to branch 'PR-2068'
HEAD is now at 892476a1 docs(postman): add applicationProductSet step to initialize or repair flow
checked out revision: refs/pull/2068/head:PR-2068@892476a197ab5b59dd1a5349c20fb4331c2a409b to dir: source

Showing logs for build greencapitaltrade/fury/pr-2068 #2 stage from-build-pack and container step-git-merge
setup git user  email jenkins-x@googlegroups.com
Using SHAs from PULL_REFS=main:a773fb28bbd24d84c026c0498e38bef654023967,2068:892476a197ab5b59dd1a5349c20fb4331c2a409b:refs/pull/2068/head
using base branch main and base sha a773fb28bbd24d84c026c0498e38bef654023967
merging sha: 892476a197ab5b59dd1a5349c20fb4331c2a409b
error: error during merge: merging 892476a197ab5b59dd1a5349c20fb4331c2a409b into main: failed to run 'git merge 892476a197ab5b59dd1a5349c20fb4331c2a409b' command in directory '.', output: 'Auto-merging docs/PayDay-LSP-API.postman_collection.json
CONFLICT (content): Merge conflict in docs/PayDay-LSP-API.postman_collection.json
Auto-merging schema.graphql
CONFLICT (content): Merge conflict in schema.graphql
Auto-merging src/__tests__/execute-flow-step.test.ts
CONFLICT (content): Merge conflict in src/__tests__/execute-flow-step.test.ts
Auto-merging src/schema/documents/mutation.ts
CONFLICT (content): Merge conflict in src/schema/documents/mutation.ts
Auto-merging 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.