Showing logs for build greencapitaltrade/wasp/pr-10 #2 stage from-build-pack and container prepare
2026/06/06 11:21:47 Entrypoint initialization

Showing logs for build greencapitaltrade/wasp/pr-10 #2 stage from-build-pack and container place-scripts
2026/06/06 11:21:47 Decoded script /tekton/scripts/script-0-qcmpc
2026/06/06 11:21:47 Decoded script /tekton/scripts/script-1-trr24
2026/06/06 11:21:47 Decoded script /tekton/scripts/script-2-7fd6r
2026/06/06 11:21:47 Decoded script /tekton/scripts/script-3-s7lvq

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

Showing logs for build greencapitaltrade/wasp/pr-10 #2 stage from-build-pack and container step-git-clone
git cloning url: https://github.com/greencapitaltrade/wasp.git version refs/pull/10/head:PR-10@17fcb518740293ef1eb9843573b780d76ab604d2 to dir: source
Cloning into 'source'...
From https://github.com/greencapitaltrade/wasp
 * [new ref]         refs/pull/10/head -> PR-10
Switched to branch 'PR-10'
HEAD is now at 17fcb51 feat(fw): v1 production batch - drop FOTA, add TCA9535 custom commands
checked out revision: refs/pull/10/head:PR-10@17fcb518740293ef1eb9843573b780d76ab604d2 to dir: source

Showing logs for build greencapitaltrade/wasp/pr-10 #2 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:1c276269d4a047f7d8695a885b03a09530e00915,10:17fcb518740293ef1eb9843573b780d76ab604d2:refs/pull/10/head
using base branch feature/terra-gaps-phase1-2 and base sha 1c276269d4a047f7d8695a885b03a09530e00915
merging sha: 17fcb518740293ef1eb9843573b780d76ab604d2
error: error during merge: merging 17fcb518740293ef1eb9843573b780d76ab604d2 into feature/terra-gaps-phase1-2: failed to run 'git merge 17fcb518740293ef1eb9843573b780d76ab604d2' command in directory '.', output: 'Auto-merging TERRA_MQTT_PROTOCOL.md
CONFLICT (content): Merge conflict in TERRA_MQTT_PROTOCOL.md
Auto-merging Wasp_v2_BOM.csv
CONFLICT (add/add): Merge conflict in Wasp_v2_BOM.csv
Auto-merging Wasp_v2_Connection_Table.txt
CONFLICT (add/add): Merge conflict in Wasp_v2_Connection_Table.txt
warning: Cannot merge binary files: Wasp_v2_DNP.xlsx (HEAD vs. 17fcb518740293ef1eb9843573b780d76ab604d2)
Auto-merging Wasp_v2_DNP.xlsx
CONFLICT (content): Merge conflict in Wasp_v2_DNP.xlsx
Auto-merging Wasp_v2_Netlist.NET
CONFLICT (add/add): Merge conflict in Wasp_v2_Netlist.NET
Auto-merging Wasp_v2_kicad/README.md
CONFLICT (add/add): Merge conflict in Wasp_v2_kicad/README.md
Auto-merging a7677s-firmware/a7677s_mqtt.c
CONFLICT (content): Merge conflict in a7677s-firmware/a7677s_mqtt.c
warning: Cannot merge binary files: a7677s-firmware/a7677s_mqtt.h (HEAD vs. 17fcb518740293ef1eb9843573b780d76ab604d2)
Auto-merging a7677s-firmware/a7677s_mqtt.h
CONFLICT (content): Merge conflict in a7677s-firmware/a7677s_mqtt.h
Auto-merging a7677s-firmware/board.c
Auto-merging a7677s-firmware/board.h
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.