Error lines from build-log.txt
Environment setup
# FAILED
# Cloning tektoncd/cli at main(2eddf32b0144d017b73da66704317f2ba48540c3)
# Checking out pulls:
# 2566(08bd0c71d202caef85a43c8cf58317b3090f0236)
$ PWD=/ mkdir -p /home/prow/go/src/github.com/tektoncd/cli
$ PWD=/home/prow/go/src/github.com/tektoncd/cli git init
hint: Using 'master' as the name for the initial branch. This default branch name
... skipping 116 lines ...
$ PWD=/home/prow/go/src/github.com/tektoncd/cli GIT_AUTHOR_DATE=1753352773 GIT_COMMITTER_DATE=1753352773 git merge --no-ff 08bd0c71d202caef85a43c8cf58317b3090f0236
Auto-merging tools/go.sum
Auto-merging tools/go.mod
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging Makefile
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1
