Error lines from build-log.txt
Environment setup
# FAILED
# Cloning tektoncd/results at main(7d41e191dc56148df2f773e6ee1440767a073df7)
# Checking out pulls:
# 1028(2e9d5f527fb05e00111eead9661f694d5954af93)
$ PWD=/ mkdir -p /home/prow/go/src/github.com/tektoncd/results
$ PWD=/home/prow/go/src/github.com/tektoncd/results git init
hint: Using 'master' as the name for the initial branch. This default branch name
... skipping 76 lines ...
CONFLICT (content): Merge conflict in pkg/cli/cmd/taskrun/describe.go
Auto-merging pkg/cli/cmd/pipelinerun/logs.go
CONFLICT (content): Merge conflict in pkg/cli/cmd/pipelinerun/logs.go
Auto-merging pkg/cli/cmd/pipelinerun/list.go
Auto-merging pkg/cli/cmd/pipelinerun/describe.go
CONFLICT (content): Merge conflict in pkg/cli/cmd/pipelinerun/describe.go
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1
