Error lines from build-log.txt
Environment setup
# FAILED
# Cloning tektoncd/operator at main(de929af7cd3f1fba6f61c0503825b4e47100c91a)
# Checking out pulls:
# 2639(d4f08f309b946a22268caca81d8b3f75b60bfefe)
$ 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 105 lines ...
$ PWD=/home/prow/go/src/github.com/tektoncd/operator GIT_AUTHOR_DATE=1742209486 GIT_COMMITTER_DATE=1742209486 git merge --no-ff d4f08f309b946a22268caca81d8b3f75b60bfefe
CONFLICT (add/add): Merge conflict in pkg/reconciler/common/transformer_inject_envvar.go
Auto-merging pkg/reconciler/common/transformer_inject_envvar.go
CONFLICT (add/add): Merge conflict in pkg/reconciler/common/transformer_inject_envar_test.go
Auto-merging pkg/reconciler/common/transformer_inject_envar_test.go
Auto-merging config/openshift/base/operator.yaml
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1
