Error lines from build-log.txt
Environment setup
# FAILED
# Cloning tektoncd/operator at main(0cef0a23a6467d26bb1a4867800bb58210227e1b)
# Checking out pulls:
# 2650(57e5eeb13c15f30bd517bd3ddfa46f1bc02ce478)
$ PWD=/ mkdir -p /home/prow/go/src/github.com/tektoncd/operator
$ PWD=/home/prow/go/src/github.com/tektoncd/operator git init
hint: Using 'master' as the name for the initial branch. This default branch name
... skipping 279 lines ...
CONFLICT (content): Merge conflict in Makefile
Auto-merging .github/workflows/helm-release.yaml
CONFLICT (add/add): Merge conflict in .github/workflows/golangci-lint.yaml
Auto-merging .github/workflows/golangci-lint.yaml
Auto-merging .github/workflows/bump-payload-on-releases.yaml
Auto-merging .github/workflows/bump-payload-on-main.yaml
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1
