Showing logs for build greencapitaltrade/wasp/pr-52 #4 stage from-build-pack and container prepare 2026/06/04 13:11:17 Entrypoint initialization Showing logs for build greencapitaltrade/wasp/pr-52 #4 stage from-build-pack and container place-scripts 2026/06/04 13:11:22 Decoded script /tekton/scripts/script-0-4bvhg 2026/06/04 13:11:22 Decoded script /tekton/scripts/script-1-t8ct7 2026/06/04 13:11:22 Decoded script /tekton/scripts/script-2-kzczh 2026/06/04 13:11:22 Decoded script /tekton/scripts/script-3-pb52h Showing logs for build greencapitaltrade/wasp/pr-52 #4 stage from-build-pack and container working-dir-initializer Showing logs for build greencapitaltrade/wasp/pr-52 #4 stage from-build-pack and container step-git-clone git cloning url: https://github.com/greencapitaltrade/wasp.git version refs/pull/52/head:PR-52@0ada0e558392c94245c57c5702757e5b96e44f0a to dir: source Cloning into 'source'... From https://github.com/greencapitaltrade/wasp * [new ref] refs/pull/52/head -> PR-52 Switched to branch 'PR-52' HEAD is now at 0ada0e5 feat(a7677s): NavIC + GNSS NMEA-0183 parser module (Phase 5i / wasp#41) checked out revision: refs/pull/52/head:PR-52@0ada0e558392c94245c57c5702757e5b96e44f0a to dir: source Showing logs for build greencapitaltrade/wasp/pr-52 #4 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:3a2229b4166ee3a6b127f9db71e08c920e9f0a55,52:0ada0e558392c94245c57c5702757e5b96e44f0a:refs/pull/52/head using base branch feature/terra-gaps-phase1-2 and base sha 3a2229b4166ee3a6b127f9db71e08c920e9f0a55 merging sha: 0ada0e558392c94245c57c5702757e5b96e44f0a error: error during merge: merging 0ada0e558392c94245c57c5702757e5b96e44f0a into feature/terra-gaps-phase1-2: failed to run 'git merge 0ada0e558392c94245c57c5702757e5b96e44f0a' 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.