Showing logs for build greencapitaltrade/wasp/pr-10 #1 stage from-build-pack and container prepare 2026/05/29 14:14:33 Entrypoint initialization Showing logs for build greencapitaltrade/wasp/pr-10 #1 stage from-build-pack and container place-scripts 2026/05/29 14:14:38 Decoded script /tekton/scripts/script-0-gn9qk 2026/05/29 14:14:38 Decoded script /tekton/scripts/script-1-vtj2g 2026/05/29 14:14:38 Decoded script /tekton/scripts/script-2-lktfs 2026/05/29 14:14:38 Decoded script /tekton/scripts/script-3-5p558 Showing logs for build greencapitaltrade/wasp/pr-10 #1 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/wasp/pr-10 #1 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@0392df1d9a60a4b7fff639c295c5731a3a17331e 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 0392df1 Merge pull request #18 from greencapitaltrade/hw/pack-buck-3v8 checked out revision: refs/pull/10/head:PR-10@0392df1d9a60a4b7fff639c295c5731a3a17331e to dir: source Showing logs for build greencapitaltrade/wasp/pr-10 #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:60177f3f638a024caf8b3b7b9d5e3de01f751bd4,10:0392df1d9a60a4b7fff639c295c5731a3a17331e:refs/pull/10/head using base branch feature/terra-gaps-phase1-2 and base sha 60177f3f638a024caf8b3b7b9d5e3de01f751bd4 merging sha: 0392df1d9a60a4b7fff639c295c5731a3a17331e error: error during merge: merging 0392df1d9a60a4b7fff639c295c5731a3a17331e into feature/terra-gaps-phase1-2: failed to run 'git merge 0392df1d9a60a4b7fff639c295c5731a3a17331e' command in directory '.', output: 'Auto-merging TERRA_MQTT_PROTOCOL.md CONFLICT (content): Merge conflict in TERRA_MQTT_PROTOCOL.md Auto-merging a7677s-firmware/a7677s_mqtt.c CONFLICT (content): Merge conflict in a7677s-firmware/a7677s_mqtt.c 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.