This job view page is being replaced by Spyglass soon. Check out the new job view.
PRpuerco: [1.20][go1.15] Update to go1.15.14
ResultFAILURE
Tests 0 failed / 0 succeeded
Started2021-07-14 04:00
Elapsed0.00s
Revision
Refs 103677

No Test Failures!


Error lines from build-log.txt

... skipping 40 lines ...

HEAD is now at 93c1fb2 replacing k/k8s.io links in docs (#263)
$ git branch --force master FETCH_HEAD
$ git checkout master
Switched to branch 'master'
$ git submodule update --init --recursive
# FAILED
# Cloning kubernetes/kubernetes at release-1.20(9bdbdaa89a7a29bc31dc55bc62ab7d0c64a5ce75)
# Checking out pulls:
#	103677(26c3ee7e69a769b380b148903a234b34c62a27a1)
$ mkdir -p /home/prow/go/src/k8s.io/kubernetes
$ git init
hint: Using 'master' as the name for the initial branch. This default branch name
... skipping 848 lines ...
 * branch                    26c3ee7e69a769b380b148903a234b34c62a27a1 -> FETCH_HEAD
$ git merge --no-ff 26c3ee7e69a769b380b148903a234b34c62a27a1
Auto-merging build/workspace.bzl
Auto-merging build/dependencies.yaml
Auto-merging build/common.sh
CONFLICT (content): Merge conflict in build/common.sh
Automatic merge failed; fix conflicts and then commit the result.
# Error: exit status 1