Showing logs for build greencapitaltrade/wasp/pr-25 #1 stage from-build-pack and container prepare
2026/06/01 07:39:00 Entrypoint initialization

Showing logs for build greencapitaltrade/wasp/pr-25 #1 stage from-build-pack and container place-scripts
2026/06/01 07:39:08 Decoded script /tekton/scripts/script-0-98g8t
2026/06/01 07:39:08 Decoded script /tekton/scripts/script-1-f8t6h
2026/06/01 07:39:08 Decoded script /tekton/scripts/script-2-4zc79
2026/06/01 07:39:08 Decoded script /tekton/scripts/script-3-gx7s8

Showing logs for build greencapitaltrade/wasp/pr-25 #1 stage from-build-pack and container working-dir-initializer

Showing logs for build greencapitaltrade/wasp/pr-25 #1 stage from-build-pack and container step-git-clone
git cloning url: https://github.com/greencapitaltrade/wasp.git version refs/pull/25/head:PR-25@fd04f100f571c30e3ae024dee8e3911d30024e9c to dir: source
Cloning into 'source'...
From https://github.com/greencapitaltrade/wasp
 * [new ref]         refs/pull/25/head -> PR-25
Switched to branch 'PR-25'
HEAD is now at fd04f10 feat(a7677s): 0x30 Config packet handler — install TPDF maps at runtime (Phase 5g)
checked out revision: refs/pull/25/head:PR-25@fd04f100f571c30e3ae024dee8e3911d30024e9c to dir: source

Showing logs for build greencapitaltrade/wasp/pr-25 #1 stage from-build-pack and container step-git-merge
setup git user  email jenkins-x@googlegroups.com
Using SHAs from PULL_REFS=feature/terra-gaps-phase1-2:22c265e7b7577c89d6b419182cf7a9d00fcb79fc,25:fd04f100f571c30e3ae024dee8e3911d30024e9c:refs/pull/25/head
using base branch feature/terra-gaps-phase1-2 and base sha 22c265e7b7577c89d6b419182cf7a9d00fcb79fc
merging sha: fd04f100f571c30e3ae024dee8e3911d30024e9c
error: error during merge: merging fd04f100f571c30e3ae024dee8e3911d30024e9c into feature/terra-gaps-phase1-2: failed to run 'git merge fd04f100f571c30e3ae024dee8e3911d30024e9c' command in directory '.', output: 'Auto-merging a7677s-firmware/tests/.gitignore
CONFLICT (content): Merge conflict in a7677s-firmware/tests/.gitignore
Auto-merging a7677s-firmware/tests/Makefile
CONFLICT (content): Merge conflict in a7677s-firmware/tests/Makefile
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.