Showing logs for build greencapitaltrade/flash/pr-322 #3 stage from-build-pack and container prepare
2026/09/12 19:26:36 Entrypoint initialization

Showing logs for build greencapitaltrade/flash/pr-322 #3 stage from-build-pack and container place-scripts
2026/09/12 19:26:37 Decoded script /tekton/scripts/script-0-8l282
2026/09/12 19:26:37 Decoded script /tekton/scripts/script-1-ssrdw
2026/09/12 19:26:37 Decoded script /tekton/scripts/script-2-w6x9w
2026/09/12 19:26:37 Decoded script /tekton/scripts/script-3-5rlj4
2026/09/12 19:26:37 Decoded script /tekton/scripts/script-4-zktzw
2026/09/12 19:26:37 Decoded script /tekton/scripts/script-5-7m6mb
2026/09/12 19:26:37 Decoded script /tekton/scripts/script-6-twmgh
2026/09/12 19:26:37 Decoded script /tekton/scripts/script-7-p77sq
2026/09/12 19:26:37 Decoded script /tekton/scripts/script-8-22rjw
2026/09/12 19:26:37 Decoded script /tekton/scripts/script-9-fdfr9
2026/09/12 19:26:37 Decoded script /tekton/scripts/script-11-qjzxs
2026/09/12 19:26:37 Decoded script /tekton/scripts/script-12-hvd77

Showing logs for build greencapitaltrade/flash/pr-322 #3 stage from-build-pack and container working-dir-initializer

Showing logs for build greencapitaltrade/flash/pr-322 #3 stage from-build-pack and container step-git-clone
git cloning url: https://github.com/greencapitaltrade/flash.git version refs/pull/322/head:PR-322@63b489065878204fd5d55146ad4186333161b6bf to dir: source
Cloning into 'source'...
From https://github.com/greencapitaltrade/flash
 * [new ref]           refs/pull/322/head -> PR-322
Switched to branch 'PR-322'
HEAD is now at 63b48906 feat(tags): wire TagManagementScreen to Fury assetTags CRUD surface
checked out revision: refs/pull/322/head:PR-322@63b489065878204fd5d55146ad4186333161b6bf to dir: source

Showing logs for build greencapitaltrade/flash/pr-322 #3 stage from-build-pack and container step-git-merge
setup git user  email jenkins-x@googlegroups.com
Using SHAs from PULL_REFS=main:c62240d1d1c96e11777fca29c38cd8f963b56b82,322:63b489065878204fd5d55146ad4186333161b6bf:refs/pull/322/head
using base branch main and base sha c62240d1d1c96e11777fca29c38cd8f963b56b82
merging sha: 63b489065878204fd5d55146ad4186333161b6bf
error: error during merge: merging 63b489065878204fd5d55146ad4186333161b6bf into main: failed to run 'git merge 63b489065878204fd5d55146ad4186333161b6bf' command in directory '.', output: 'Auto-merging ASSET_MANAGEMENT.md
Auto-merging packages/app/features/asset/screens/TagManagementScreen.tsx
CONFLICT (content): Merge conflict in packages/app/features/asset/screens/TagManagementScreen.tsx
Auto-merging packages/app/features/asset/types/index.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.