Showing logs for build greencapitaltrade/wasp/pr-79 #1 stage from-build-pack and container prepare 2026/06/04 19:29:25 Entrypoint initialization Showing logs for build greencapitaltrade/wasp/pr-79 #1 stage from-build-pack and container place-scripts 2026/06/04 19:29:25 Decoded script /tekton/scripts/script-0-wqcbk 2026/06/04 19:29:25 Decoded script /tekton/scripts/script-1-t5pkt 2026/06/04 19:29:25 Decoded script /tekton/scripts/script-2-qc4jt 2026/06/04 19:29:25 Decoded script /tekton/scripts/script-3-zvmf9 Showing logs for build greencapitaltrade/wasp/pr-79 #1 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/wasp/pr-79 #1 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/wasp.git version refs/pull/79/head:PR-79@86d983710fe3c3f10e67b4393ccbc8c349f5f748 to dir: source Cloning into 'source'... From https://github.com/greencapitaltrade/wasp * [new ref] refs/pull/79/head -> PR-79 Switched to branch 'PR-79' HEAD is now at 86d9837 fix(board): resolve all TODO(board) placeholders and fix GPIO/ADC conflicts (wasp#70) checked out revision: refs/pull/79/head:PR-79@86d983710fe3c3f10e67b4393ccbc8c349f5f748 to dir: source Showing logs for build greencapitaltrade/wasp/pr-79 #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:1c276269d4a047f7d8695a885b03a09530e00915,79:86d983710fe3c3f10e67b4393ccbc8c349f5f748:refs/pull/79/head using base branch feature/terra-gaps-phase1-2 and base sha 1c276269d4a047f7d8695a885b03a09530e00915 merging sha: 86d983710fe3c3f10e67b4393ccbc8c349f5f748 error: error during merge: merging 86d983710fe3c3f10e67b4393ccbc8c349f5f748 into feature/terra-gaps-phase1-2: failed to run 'git merge 86d983710fe3c3f10e67b4393ccbc8c349f5f748' command in directory '.', output: '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.