Error lines from build-log.txt
Environment setup
# FAILED
# Cloning tektoncd/chains at main(5ff7dc5ec0b2418358f981587d56ab446be493a4)
# Checking out pulls:
# 1374(e23a70d8cfd17e977fabfeee5c92484b0f3b29cd)
$ PWD=/ mkdir -p /home/prow/go/src/github.com/tektoncd/chains
$ PWD=/home/prow/go/src/github.com/tektoncd/chains git init
hint: Using 'master' as the name for the initial branch. This default branch name
... skipping 80 lines ...
$ PWD=/home/prow/go/src/github.com/tektoncd/chains git fetch https://github.com/tektoncd/chains.git e23a70d8cfd17e977fabfeee5c92484b0f3b29cd
From https://github.com/tektoncd/chains
* branch e23a70d8cfd17e977fabfeee5c92484b0f3b29cd -> FETCH_HEAD
$ PWD=/home/prow/go/src/github.com/tektoncd/chains GIT_AUTHOR_DATE=1749557731 GIT_COMMITTER_DATE=1749557731 git merge --no-ff e23a70d8cfd17e977fabfeee5c92484b0f3b29cd
Auto-merging pkg/chains/storage/oci/oci_test.go
CONFLICT (content): Merge conflict in pkg/chains/storage/oci/oci_test.go
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1
