Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container prepare 2026/05/06 13:29:03 Entrypoint initialization Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container place-scripts 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-0-f6gjn 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-1-lmg4j 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-2-vgbvp 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-3-4gpbz 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-4-g4jkv 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-5-gg6hd 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-6-gx8k8 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-7-h4n6d 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-8-k6kjr Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/fury.git version refs/pull/1927/head:PR-1927@6caef99bf8f02068bc4b2f00e16db5729876d291 to dir: source Cloning into 'source'... From https://github.com/greencapitaltrade/fury * [new ref] refs/pull/1927/head -> PR-1927 Switched to branch 'PR-1927' HEAD is now at 6caef99b chore: retrigger checked out revision: refs/pull/1927/head:PR-1927@6caef99bf8f02068bc4b2f00e16db5729876d291 to dir: source Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:5985c8f3dec8eb77dc66fac8e502bd0161de851b,1927:6caef99bf8f02068bc4b2f00e16db5729876d291:refs/pull/1927/head using base branch main and base sha 5985c8f3dec8eb77dc66fac8e502bd0161de851b merging sha: 6caef99bf8f02068bc4b2f00e16db5729876d291 error: error during merge: merging 6caef99bf8f02068bc4b2f00e16db5729876d291 into main: failed to run 'git merge 6caef99bf8f02068bc4b2f00e16db5729876d291' command in directory '.', output: 'Auto-merging schema.graphql CONFLICT (content): Merge conflict in schema.graphql Auto-merging src/__tests__/fleet-resolvers.test.ts CONFLICT (content): Merge conflict in src/__tests__/fleet-resolvers.test.ts Auto-merging src/schema/asset/mutation.ts CONFLICT (content): Merge conflict in src/schema/asset/mutation.ts CONFLICT (file location): src/schema/fleet/resolvers/assetTypes.ts added in 6caef99bf8f02068bc4b2f00e16db5729876d291 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to src/schema/asset/resolvers/assetTypes.ts. Auto-merging src/schema/asset/resolvers/assetTypes.ts CONFLICT (add/add): Merge conflict in src/schema/asset/resolvers/assetTypes.ts Auto-merging src/schema/asset/resolvers/dashboard.ts CONFLICT (content): Merge conflict in src/schema/asset/resolvers/dashboard.ts Auto-merging src/schema/asset/resolvers/index.ts Auto-merging src/schema/asset/resolvers/members.ts CONFLICT (modify/delete): src/schema/fleet/query.ts deleted in HEAD and modified in 6caef99bf8f02068bc4b2f00e16db5729876d291. Version 6caef99bf8f02068bc4b2f00e16db5729876d291 of src/schema/fleet/query.ts left in tree. Auto-merging src/schema/index.ts CONFLICT (content): Merge conflict in src/schema/index.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. Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container prepare 2026/05/06 13:29:03 Entrypoint initialization Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container place-scripts 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-0-f6gjn 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-1-lmg4j 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-2-vgbvp 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-3-4gpbz 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-4-g4jkv 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-5-gg6hd 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-6-gx8k8 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-7-h4n6d 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-8-k6kjr Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/fury.git version refs/pull/1927/head:PR-1927@6caef99bf8f02068bc4b2f00e16db5729876d291 to dir: source Cloning into 'source'... From https://github.com/greencapitaltrade/fury * [new ref] refs/pull/1927/head -> PR-1927 Switched to branch 'PR-1927' HEAD is now at 6caef99b chore: retrigger checked out revision: refs/pull/1927/head:PR-1927@6caef99bf8f02068bc4b2f00e16db5729876d291 to dir: source Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:5985c8f3dec8eb77dc66fac8e502bd0161de851b,1927:6caef99bf8f02068bc4b2f00e16db5729876d291:refs/pull/1927/head using base branch main and base sha 5985c8f3dec8eb77dc66fac8e502bd0161de851b merging sha: 6caef99bf8f02068bc4b2f00e16db5729876d291 error: error during merge: merging 6caef99bf8f02068bc4b2f00e16db5729876d291 into main: failed to run 'git merge 6caef99bf8f02068bc4b2f00e16db5729876d291' command in directory '.', output: 'Auto-merging schema.graphql CONFLICT (content): Merge conflict in schema.graphql Auto-merging src/__tests__/fleet-resolvers.test.ts CONFLICT (content): Merge conflict in src/__tests__/fleet-resolvers.test.ts Auto-merging src/schema/asset/mutation.ts CONFLICT (content): Merge conflict in src/schema/asset/mutation.ts CONFLICT (file location): src/schema/fleet/resolvers/assetTypes.ts added in 6caef99bf8f02068bc4b2f00e16db5729876d291 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to src/schema/asset/resolvers/assetTypes.ts. Auto-merging src/schema/asset/resolvers/assetTypes.ts CONFLICT (add/add): Merge conflict in src/schema/asset/resolvers/assetTypes.ts Auto-merging src/schema/asset/resolvers/dashboard.ts CONFLICT (content): Merge conflict in src/schema/asset/resolvers/dashboard.ts Auto-merging src/schema/asset/resolvers/index.ts Auto-merging src/schema/asset/resolvers/members.ts CONFLICT (modify/delete): src/schema/fleet/query.ts deleted in HEAD and modified in 6caef99bf8f02068bc4b2f00e16db5729876d291. Version 6caef99bf8f02068bc4b2f00e16db5729876d291 of src/schema/fleet/query.ts left in tree. Auto-merging src/schema/index.ts CONFLICT (content): Merge conflict in src/schema/index.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. Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container prepare 2026/05/06 13:29:03 Entrypoint initialization Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container place-scripts 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-0-f6gjn 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-1-lmg4j 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-2-vgbvp 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-3-4gpbz 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-4-g4jkv 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-5-gg6hd 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-6-gx8k8 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-7-h4n6d 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-8-k6kjr Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/fury.git version refs/pull/1927/head:PR-1927@6caef99bf8f02068bc4b2f00e16db5729876d291 to dir: source Cloning into 'source'... From https://github.com/greencapitaltrade/fury * [new ref] refs/pull/1927/head -> PR-1927 Switched to branch 'PR-1927' HEAD is now at 6caef99b chore: retrigger checked out revision: refs/pull/1927/head:PR-1927@6caef99bf8f02068bc4b2f00e16db5729876d291 to dir: source Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:5985c8f3dec8eb77dc66fac8e502bd0161de851b,1927:6caef99bf8f02068bc4b2f00e16db5729876d291:refs/pull/1927/head using base branch main and base sha 5985c8f3dec8eb77dc66fac8e502bd0161de851b merging sha: 6caef99bf8f02068bc4b2f00e16db5729876d291 error: error during merge: merging 6caef99bf8f02068bc4b2f00e16db5729876d291 into main: failed to run 'git merge 6caef99bf8f02068bc4b2f00e16db5729876d291' command in directory '.', output: 'Auto-merging schema.graphql CONFLICT (content): Merge conflict in schema.graphql Auto-merging src/__tests__/fleet-resolvers.test.ts CONFLICT (content): Merge conflict in src/__tests__/fleet-resolvers.test.ts Auto-merging src/schema/asset/mutation.ts CONFLICT (content): Merge conflict in src/schema/asset/mutation.ts CONFLICT (file location): src/schema/fleet/resolvers/assetTypes.ts added in 6caef99bf8f02068bc4b2f00e16db5729876d291 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to src/schema/asset/resolvers/assetTypes.ts. Auto-merging src/schema/asset/resolvers/assetTypes.ts CONFLICT (add/add): Merge conflict in src/schema/asset/resolvers/assetTypes.ts Auto-merging src/schema/asset/resolvers/dashboard.ts CONFLICT (content): Merge conflict in src/schema/asset/resolvers/dashboard.ts Auto-merging src/schema/asset/resolvers/index.ts Auto-merging src/schema/asset/resolvers/members.ts CONFLICT (modify/delete): src/schema/fleet/query.ts deleted in HEAD and modified in 6caef99bf8f02068bc4b2f00e16db5729876d291. Version 6caef99bf8f02068bc4b2f00e16db5729876d291 of src/schema/fleet/query.ts left in tree. Auto-merging src/schema/index.ts CONFLICT (content): Merge conflict in src/schema/index.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. Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container prepare 2026/05/06 13:29:03 Entrypoint initialization Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container place-scripts 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-0-f6gjn 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-1-lmg4j 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-2-vgbvp 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-3-4gpbz 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-4-g4jkv 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-5-gg6hd 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-6-gx8k8 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-7-h4n6d 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-8-k6kjr Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/fury.git version refs/pull/1927/head:PR-1927@6caef99bf8f02068bc4b2f00e16db5729876d291 to dir: source Cloning into 'source'... From https://github.com/greencapitaltrade/fury * [new ref] refs/pull/1927/head -> PR-1927 Switched to branch 'PR-1927' HEAD is now at 6caef99b chore: retrigger checked out revision: refs/pull/1927/head:PR-1927@6caef99bf8f02068bc4b2f00e16db5729876d291 to dir: source Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:5985c8f3dec8eb77dc66fac8e502bd0161de851b,1927:6caef99bf8f02068bc4b2f00e16db5729876d291:refs/pull/1927/head using base branch main and base sha 5985c8f3dec8eb77dc66fac8e502bd0161de851b merging sha: 6caef99bf8f02068bc4b2f00e16db5729876d291 error: error during merge: merging 6caef99bf8f02068bc4b2f00e16db5729876d291 into main: failed to run 'git merge 6caef99bf8f02068bc4b2f00e16db5729876d291' command in directory '.', output: 'Auto-merging schema.graphql CONFLICT (content): Merge conflict in schema.graphql Auto-merging src/__tests__/fleet-resolvers.test.ts CONFLICT (content): Merge conflict in src/__tests__/fleet-resolvers.test.ts Auto-merging src/schema/asset/mutation.ts CONFLICT (content): Merge conflict in src/schema/asset/mutation.ts CONFLICT (file location): src/schema/fleet/resolvers/assetTypes.ts added in 6caef99bf8f02068bc4b2f00e16db5729876d291 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to src/schema/asset/resolvers/assetTypes.ts. Auto-merging src/schema/asset/resolvers/assetTypes.ts CONFLICT (add/add): Merge conflict in src/schema/asset/resolvers/assetTypes.ts Auto-merging src/schema/asset/resolvers/dashboard.ts CONFLICT (content): Merge conflict in src/schema/asset/resolvers/dashboard.ts Auto-merging src/schema/asset/resolvers/index.ts Auto-merging src/schema/asset/resolvers/members.ts CONFLICT (modify/delete): src/schema/fleet/query.ts deleted in HEAD and modified in 6caef99bf8f02068bc4b2f00e16db5729876d291. Version 6caef99bf8f02068bc4b2f00e16db5729876d291 of src/schema/fleet/query.ts left in tree. Auto-merging src/schema/index.ts CONFLICT (content): Merge conflict in src/schema/index.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. Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container prepare 2026/05/06 13:29:03 Entrypoint initialization Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container place-scripts 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-0-f6gjn 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-1-lmg4j 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-2-vgbvp 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-3-4gpbz 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-4-g4jkv 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-5-gg6hd 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-6-gx8k8 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-7-h4n6d 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-8-k6kjr Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/fury.git version refs/pull/1927/head:PR-1927@6caef99bf8f02068bc4b2f00e16db5729876d291 to dir: source Cloning into 'source'... From https://github.com/greencapitaltrade/fury * [new ref] refs/pull/1927/head -> PR-1927 Switched to branch 'PR-1927' HEAD is now at 6caef99b chore: retrigger checked out revision: refs/pull/1927/head:PR-1927@6caef99bf8f02068bc4b2f00e16db5729876d291 to dir: source Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:5985c8f3dec8eb77dc66fac8e502bd0161de851b,1927:6caef99bf8f02068bc4b2f00e16db5729876d291:refs/pull/1927/head using base branch main and base sha 5985c8f3dec8eb77dc66fac8e502bd0161de851b merging sha: 6caef99bf8f02068bc4b2f00e16db5729876d291 error: error during merge: merging 6caef99bf8f02068bc4b2f00e16db5729876d291 into main: failed to run 'git merge 6caef99bf8f02068bc4b2f00e16db5729876d291' command in directory '.', output: 'Auto-merging schema.graphql CONFLICT (content): Merge conflict in schema.graphql Auto-merging src/__tests__/fleet-resolvers.test.ts CONFLICT (content): Merge conflict in src/__tests__/fleet-resolvers.test.ts Auto-merging src/schema/asset/mutation.ts CONFLICT (content): Merge conflict in src/schema/asset/mutation.ts CONFLICT (file location): src/schema/fleet/resolvers/assetTypes.ts added in 6caef99bf8f02068bc4b2f00e16db5729876d291 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to src/schema/asset/resolvers/assetTypes.ts. Auto-merging src/schema/asset/resolvers/assetTypes.ts CONFLICT (add/add): Merge conflict in src/schema/asset/resolvers/assetTypes.ts Auto-merging src/schema/asset/resolvers/dashboard.ts CONFLICT (content): Merge conflict in src/schema/asset/resolvers/dashboard.ts Auto-merging src/schema/asset/resolvers/index.ts Auto-merging src/schema/asset/resolvers/members.ts CONFLICT (modify/delete): src/schema/fleet/query.ts deleted in HEAD and modified in 6caef99bf8f02068bc4b2f00e16db5729876d291. Version 6caef99bf8f02068bc4b2f00e16db5729876d291 of src/schema/fleet/query.ts left in tree. Auto-merging src/schema/index.ts CONFLICT (content): Merge conflict in src/schema/index.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. Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container prepare 2026/05/06 13:29:03 Entrypoint initialization Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container place-scripts 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-0-f6gjn 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-1-lmg4j 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-2-vgbvp 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-3-4gpbz 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-4-g4jkv 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-5-gg6hd 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-6-gx8k8 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-7-h4n6d 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-8-k6kjr Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/fury.git version refs/pull/1927/head:PR-1927@6caef99bf8f02068bc4b2f00e16db5729876d291 to dir: source Cloning into 'source'... From https://github.com/greencapitaltrade/fury * [new ref] refs/pull/1927/head -> PR-1927 Switched to branch 'PR-1927' HEAD is now at 6caef99b chore: retrigger checked out revision: refs/pull/1927/head:PR-1927@6caef99bf8f02068bc4b2f00e16db5729876d291 to dir: source Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:5985c8f3dec8eb77dc66fac8e502bd0161de851b,1927:6caef99bf8f02068bc4b2f00e16db5729876d291:refs/pull/1927/head using base branch main and base sha 5985c8f3dec8eb77dc66fac8e502bd0161de851b merging sha: 6caef99bf8f02068bc4b2f00e16db5729876d291 error: error during merge: merging 6caef99bf8f02068bc4b2f00e16db5729876d291 into main: failed to run 'git merge 6caef99bf8f02068bc4b2f00e16db5729876d291' command in directory '.', output: 'Auto-merging schema.graphql CONFLICT (content): Merge conflict in schema.graphql Auto-merging src/__tests__/fleet-resolvers.test.ts CONFLICT (content): Merge conflict in src/__tests__/fleet-resolvers.test.ts Auto-merging src/schema/asset/mutation.ts CONFLICT (content): Merge conflict in src/schema/asset/mutation.ts CONFLICT (file location): src/schema/fleet/resolvers/assetTypes.ts added in 6caef99bf8f02068bc4b2f00e16db5729876d291 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to src/schema/asset/resolvers/assetTypes.ts. Auto-merging src/schema/asset/resolvers/assetTypes.ts CONFLICT (add/add): Merge conflict in src/schema/asset/resolvers/assetTypes.ts Auto-merging src/schema/asset/resolvers/dashboard.ts CONFLICT (content): Merge conflict in src/schema/asset/resolvers/dashboard.ts Auto-merging src/schema/asset/resolvers/index.ts Auto-merging src/schema/asset/resolvers/members.ts CONFLICT (modify/delete): src/schema/fleet/query.ts deleted in HEAD and modified in 6caef99bf8f02068bc4b2f00e16db5729876d291. Version 6caef99bf8f02068bc4b2f00e16db5729876d291 of src/schema/fleet/query.ts left in tree. Auto-merging src/schema/index.ts CONFLICT (content): Merge conflict in src/schema/index.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. Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container prepare 2026/05/06 13:29:03 Entrypoint initialization Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container place-scripts 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-0-f6gjn 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-1-lmg4j 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-2-vgbvp 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-3-4gpbz 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-4-g4jkv 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-5-gg6hd 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-6-gx8k8 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-7-h4n6d 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-8-k6kjr Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/fury.git version refs/pull/1927/head:PR-1927@6caef99bf8f02068bc4b2f00e16db5729876d291 to dir: source Cloning into 'source'... From https://github.com/greencapitaltrade/fury * [new ref] refs/pull/1927/head -> PR-1927 Switched to branch 'PR-1927' HEAD is now at 6caef99b chore: retrigger checked out revision: refs/pull/1927/head:PR-1927@6caef99bf8f02068bc4b2f00e16db5729876d291 to dir: source Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:5985c8f3dec8eb77dc66fac8e502bd0161de851b,1927:6caef99bf8f02068bc4b2f00e16db5729876d291:refs/pull/1927/head using base branch main and base sha 5985c8f3dec8eb77dc66fac8e502bd0161de851b merging sha: 6caef99bf8f02068bc4b2f00e16db5729876d291 error: error during merge: merging 6caef99bf8f02068bc4b2f00e16db5729876d291 into main: failed to run 'git merge 6caef99bf8f02068bc4b2f00e16db5729876d291' command in directory '.', output: 'Auto-merging schema.graphql CONFLICT (content): Merge conflict in schema.graphql Auto-merging src/__tests__/fleet-resolvers.test.ts CONFLICT (content): Merge conflict in src/__tests__/fleet-resolvers.test.ts Auto-merging src/schema/asset/mutation.ts CONFLICT (content): Merge conflict in src/schema/asset/mutation.ts CONFLICT (file location): src/schema/fleet/resolvers/assetTypes.ts added in 6caef99bf8f02068bc4b2f00e16db5729876d291 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to src/schema/asset/resolvers/assetTypes.ts. Auto-merging src/schema/asset/resolvers/assetTypes.ts CONFLICT (add/add): Merge conflict in src/schema/asset/resolvers/assetTypes.ts Auto-merging src/schema/asset/resolvers/dashboard.ts CONFLICT (content): Merge conflict in src/schema/asset/resolvers/dashboard.ts Auto-merging src/schema/asset/resolvers/index.ts Auto-merging src/schema/asset/resolvers/members.ts CONFLICT (modify/delete): src/schema/fleet/query.ts deleted in HEAD and modified in 6caef99bf8f02068bc4b2f00e16db5729876d291. Version 6caef99bf8f02068bc4b2f00e16db5729876d291 of src/schema/fleet/query.ts left in tree. Auto-merging src/schema/index.ts CONFLICT (content): Merge conflict in src/schema/index.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. Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container prepare 2026/05/06 13:29:03 Entrypoint initialization Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container place-scripts 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-0-f6gjn 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-1-lmg4j 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-2-vgbvp 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-3-4gpbz 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-4-g4jkv 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-5-gg6hd 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-6-gx8k8 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-7-h4n6d 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-8-k6kjr Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/fury.git version refs/pull/1927/head:PR-1927@6caef99bf8f02068bc4b2f00e16db5729876d291 to dir: source Cloning into 'source'... From https://github.com/greencapitaltrade/fury * [new ref] refs/pull/1927/head -> PR-1927 Switched to branch 'PR-1927' HEAD is now at 6caef99b chore: retrigger checked out revision: refs/pull/1927/head:PR-1927@6caef99bf8f02068bc4b2f00e16db5729876d291 to dir: source Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:5985c8f3dec8eb77dc66fac8e502bd0161de851b,1927:6caef99bf8f02068bc4b2f00e16db5729876d291:refs/pull/1927/head using base branch main and base sha 5985c8f3dec8eb77dc66fac8e502bd0161de851b merging sha: 6caef99bf8f02068bc4b2f00e16db5729876d291 error: error during merge: merging 6caef99bf8f02068bc4b2f00e16db5729876d291 into main: failed to run 'git merge 6caef99bf8f02068bc4b2f00e16db5729876d291' command in directory '.', output: 'Auto-merging schema.graphql CONFLICT (content): Merge conflict in schema.graphql Auto-merging src/__tests__/fleet-resolvers.test.ts CONFLICT (content): Merge conflict in src/__tests__/fleet-resolvers.test.ts Auto-merging src/schema/asset/mutation.ts CONFLICT (content): Merge conflict in src/schema/asset/mutation.ts CONFLICT (file location): src/schema/fleet/resolvers/assetTypes.ts added in 6caef99bf8f02068bc4b2f00e16db5729876d291 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to src/schema/asset/resolvers/assetTypes.ts. Auto-merging src/schema/asset/resolvers/assetTypes.ts CONFLICT (add/add): Merge conflict in src/schema/asset/resolvers/assetTypes.ts Auto-merging src/schema/asset/resolvers/dashboard.ts CONFLICT (content): Merge conflict in src/schema/asset/resolvers/dashboard.ts Auto-merging src/schema/asset/resolvers/index.ts Auto-merging src/schema/asset/resolvers/members.ts CONFLICT (modify/delete): src/schema/fleet/query.ts deleted in HEAD and modified in 6caef99bf8f02068bc4b2f00e16db5729876d291. Version 6caef99bf8f02068bc4b2f00e16db5729876d291 of src/schema/fleet/query.ts left in tree. Auto-merging src/schema/index.ts CONFLICT (content): Merge conflict in src/schema/index.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. Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container prepare 2026/05/06 13:29:03 Entrypoint initialization Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container place-scripts 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-0-f6gjn 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-1-lmg4j 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-2-vgbvp 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-3-4gpbz 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-4-g4jkv 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-5-gg6hd 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-6-gx8k8 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-7-h4n6d 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-8-k6kjr Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/fury.git version refs/pull/1927/head:PR-1927@6caef99bf8f02068bc4b2f00e16db5729876d291 to dir: source Cloning into 'source'... From https://github.com/greencapitaltrade/fury * [new ref] refs/pull/1927/head -> PR-1927 Switched to branch 'PR-1927' HEAD is now at 6caef99b chore: retrigger checked out revision: refs/pull/1927/head:PR-1927@6caef99bf8f02068bc4b2f00e16db5729876d291 to dir: source Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:5985c8f3dec8eb77dc66fac8e502bd0161de851b,1927:6caef99bf8f02068bc4b2f00e16db5729876d291:refs/pull/1927/head using base branch main and base sha 5985c8f3dec8eb77dc66fac8e502bd0161de851b merging sha: 6caef99bf8f02068bc4b2f00e16db5729876d291 error: error during merge: merging 6caef99bf8f02068bc4b2f00e16db5729876d291 into main: failed to run 'git merge 6caef99bf8f02068bc4b2f00e16db5729876d291' command in directory '.', output: 'Auto-merging schema.graphql CONFLICT (content): Merge conflict in schema.graphql Auto-merging src/__tests__/fleet-resolvers.test.ts CONFLICT (content): Merge conflict in src/__tests__/fleet-resolvers.test.ts Auto-merging src/schema/asset/mutation.ts CONFLICT (content): Merge conflict in src/schema/asset/mutation.ts CONFLICT (file location): src/schema/fleet/resolvers/assetTypes.ts added in 6caef99bf8f02068bc4b2f00e16db5729876d291 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to src/schema/asset/resolvers/assetTypes.ts. Auto-merging src/schema/asset/resolvers/assetTypes.ts CONFLICT (add/add): Merge conflict in src/schema/asset/resolvers/assetTypes.ts Auto-merging src/schema/asset/resolvers/dashboard.ts CONFLICT (content): Merge conflict in src/schema/asset/resolvers/dashboard.ts Auto-merging src/schema/asset/resolvers/index.ts Auto-merging src/schema/asset/resolvers/members.ts CONFLICT (modify/delete): src/schema/fleet/query.ts deleted in HEAD and modified in 6caef99bf8f02068bc4b2f00e16db5729876d291. Version 6caef99bf8f02068bc4b2f00e16db5729876d291 of src/schema/fleet/query.ts left in tree. Auto-merging src/schema/index.ts CONFLICT (content): Merge conflict in src/schema/index.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. Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container prepare 2026/05/06 13:29:03 Entrypoint initialization Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container place-scripts 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-0-f6gjn 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-1-lmg4j 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-2-vgbvp 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-3-4gpbz 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-4-g4jkv 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-5-gg6hd 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-6-gx8k8 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-7-h4n6d 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-8-k6kjr Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/fury.git version refs/pull/1927/head:PR-1927@6caef99bf8f02068bc4b2f00e16db5729876d291 to dir: source Cloning into 'source'... From https://github.com/greencapitaltrade/fury * [new ref] refs/pull/1927/head -> PR-1927 Switched to branch 'PR-1927' HEAD is now at 6caef99b chore: retrigger checked out revision: refs/pull/1927/head:PR-1927@6caef99bf8f02068bc4b2f00e16db5729876d291 to dir: source Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:5985c8f3dec8eb77dc66fac8e502bd0161de851b,1927:6caef99bf8f02068bc4b2f00e16db5729876d291:refs/pull/1927/head using base branch main and base sha 5985c8f3dec8eb77dc66fac8e502bd0161de851b merging sha: 6caef99bf8f02068bc4b2f00e16db5729876d291 error: error during merge: merging 6caef99bf8f02068bc4b2f00e16db5729876d291 into main: failed to run 'git merge 6caef99bf8f02068bc4b2f00e16db5729876d291' command in directory '.', output: 'Auto-merging schema.graphql CONFLICT (content): Merge conflict in schema.graphql Auto-merging src/__tests__/fleet-resolvers.test.ts CONFLICT (content): Merge conflict in src/__tests__/fleet-resolvers.test.ts Auto-merging src/schema/asset/mutation.ts CONFLICT (content): Merge conflict in src/schema/asset/mutation.ts CONFLICT (file location): src/schema/fleet/resolvers/assetTypes.ts added in 6caef99bf8f02068bc4b2f00e16db5729876d291 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to src/schema/asset/resolvers/assetTypes.ts. Auto-merging src/schema/asset/resolvers/assetTypes.ts CONFLICT (add/add): Merge conflict in src/schema/asset/resolvers/assetTypes.ts Auto-merging src/schema/asset/resolvers/dashboard.ts CONFLICT (content): Merge conflict in src/schema/asset/resolvers/dashboard.ts Auto-merging src/schema/asset/resolvers/index.ts Auto-merging src/schema/asset/resolvers/members.ts CONFLICT (modify/delete): src/schema/fleet/query.ts deleted in HEAD and modified in 6caef99bf8f02068bc4b2f00e16db5729876d291. Version 6caef99bf8f02068bc4b2f00e16db5729876d291 of src/schema/fleet/query.ts left in tree. Auto-merging src/schema/index.ts CONFLICT (content): Merge conflict in src/schema/index.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. Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container prepare 2026/05/06 13:29:03 Entrypoint initialization Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container place-scripts 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-0-f6gjn 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-1-lmg4j 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-2-vgbvp 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-3-4gpbz 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-4-g4jkv 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-5-gg6hd 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-6-gx8k8 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-7-h4n6d 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-8-k6kjr Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/fury.git version refs/pull/1927/head:PR-1927@6caef99bf8f02068bc4b2f00e16db5729876d291 to dir: source Cloning into 'source'... From https://github.com/greencapitaltrade/fury * [new ref] refs/pull/1927/head -> PR-1927 Switched to branch 'PR-1927' HEAD is now at 6caef99b chore: retrigger checked out revision: refs/pull/1927/head:PR-1927@6caef99bf8f02068bc4b2f00e16db5729876d291 to dir: source Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:5985c8f3dec8eb77dc66fac8e502bd0161de851b,1927:6caef99bf8f02068bc4b2f00e16db5729876d291:refs/pull/1927/head using base branch main and base sha 5985c8f3dec8eb77dc66fac8e502bd0161de851b merging sha: 6caef99bf8f02068bc4b2f00e16db5729876d291 error: error during merge: merging 6caef99bf8f02068bc4b2f00e16db5729876d291 into main: failed to run 'git merge 6caef99bf8f02068bc4b2f00e16db5729876d291' command in directory '.', output: 'Auto-merging schema.graphql CONFLICT (content): Merge conflict in schema.graphql Auto-merging src/__tests__/fleet-resolvers.test.ts CONFLICT (content): Merge conflict in src/__tests__/fleet-resolvers.test.ts Auto-merging src/schema/asset/mutation.ts CONFLICT (content): Merge conflict in src/schema/asset/mutation.ts CONFLICT (file location): src/schema/fleet/resolvers/assetTypes.ts added in 6caef99bf8f02068bc4b2f00e16db5729876d291 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to src/schema/asset/resolvers/assetTypes.ts. Auto-merging src/schema/asset/resolvers/assetTypes.ts CONFLICT (add/add): Merge conflict in src/schema/asset/resolvers/assetTypes.ts Auto-merging src/schema/asset/resolvers/dashboard.ts CONFLICT (content): Merge conflict in src/schema/asset/resolvers/dashboard.ts Auto-merging src/schema/asset/resolvers/index.ts Auto-merging src/schema/asset/resolvers/members.ts CONFLICT (modify/delete): src/schema/fleet/query.ts deleted in HEAD and modified in 6caef99bf8f02068bc4b2f00e16db5729876d291. Version 6caef99bf8f02068bc4b2f00e16db5729876d291 of src/schema/fleet/query.ts left in tree. Auto-merging src/schema/index.ts CONFLICT (content): Merge conflict in src/schema/index.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. Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container prepare 2026/05/06 13:29:03 Entrypoint initialization Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container place-scripts 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-0-f6gjn 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-1-lmg4j 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-2-vgbvp 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-3-4gpbz 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-4-g4jkv 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-5-gg6hd 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-6-gx8k8 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-7-h4n6d 2026/05/06 13:29:12 Decoded script /tekton/scripts/script-8-k6kjr Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/fury.git version refs/pull/1927/head:PR-1927@6caef99bf8f02068bc4b2f00e16db5729876d291 to dir: source Cloning into 'source'... From https://github.com/greencapitaltrade/fury * [new ref] refs/pull/1927/head -> PR-1927 Switched to branch 'PR-1927' HEAD is now at 6caef99b chore: retrigger checked out revision: refs/pull/1927/head:PR-1927@6caef99bf8f02068bc4b2f00e16db5729876d291 to dir: source Showing logs for build greencapitaltrade/fury/pr-1927 #9 stage from-build-pack and container step-git-merge setup git user email jenkins-x@googlegroups.com Using SHAs from PULL_REFS=main:5985c8f3dec8eb77dc66fac8e502bd0161de851b,1927:6caef99bf8f02068bc4b2f00e16db5729876d291:refs/pull/1927/head using base branch main and base sha 5985c8f3dec8eb77dc66fac8e502bd0161de851b merging sha: 6caef99bf8f02068bc4b2f00e16db5729876d291 error: error during merge: merging 6caef99bf8f02068bc4b2f00e16db5729876d291 into main: failed to run 'git merge 6caef99bf8f02068bc4b2f00e16db5729876d291' command in directory '.', output: 'Auto-merging schema.graphql CONFLICT (content): Merge conflict in schema.graphql Auto-merging src/__tests__/fleet-resolvers.test.ts CONFLICT (content): Merge conflict in src/__tests__/fleet-resolvers.test.ts Auto-merging src/schema/asset/mutation.ts CONFLICT (content): Merge conflict in src/schema/asset/mutation.ts CONFLICT (file location): src/schema/fleet/resolvers/assetTypes.ts added in 6caef99bf8f02068bc4b2f00e16db5729876d291 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to src/schema/asset/resolvers/assetTypes.ts. Auto-merging src/schema/asset/resolvers/assetTypes.ts CONFLICT (add/add): Merge conflict in src/schema/asset/resolvers/assetTypes.ts Auto-merging src/schema/asset/resolvers/dashboard.ts CONFLICT (content): Merge conflict in src/schema/asset/resolvers/dashboard.ts Auto-merging src/schema/asset/resolvers/index.ts Auto-merging src/schema/asset/resolvers/members.ts CONFLICT (modify/delete): src/schema/fleet/query.ts deleted in HEAD and modified in 6caef99bf8f02068bc4b2f00e16db5729876d291. Version 6caef99bf8f02068bc4b2f00e16db5729876d291 of src/schema/fleet/query.ts left in tree. Auto-merging src/schema/index.ts CONFLICT (content): Merge conflict in src/schema/index.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.