This job view page is being replaced by Spyglass soon. Check out the new job view.
PRtam7t: chore: bump version 1.0.0 rc.1
ResultFAILURE
Tests 0 failed / 0 succeeded
Started2021-10-05 16:13
Elapsed0.00s
Revision
Refs 767

No Test Failures!


Error lines from build-log.txt

Environment setup
# FAILED
# Cloning kubernetes-sigs/secrets-store-csi-driver at release-1.0(a09a9d6816b01d7b5011476837f20c225254d50e)
# Checking out pulls:
#	767(44e6636d760bf607b799e30701d196c29911fbc1)
$ mkdir -p /home/prow/go/src/sigs.k8s.io/secrets-store-csi-driver
$ git init
hint: Using 'master' as the name for the initial branch. This default branch name
... skipping 86 lines ...
CONFLICT (content): Merge conflict in test/bats/helpers.bash
Auto-merging test/bats/e2e-provider.bats
Auto-merging docker/Makefile
CONFLICT (content): Merge conflict in docker/Makefile
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1