PR | chendave: Migrate Ginkgo from v1 to v2 |
Result | FAILURE |
Tests | 0 failed / 0 succeeded |
Started | |
Elapsed | 0.00s |
Revision | |
Refs |
109111 |
... skipping 71 lines ... HEAD is now at 1800ced7 Merge pull request #2517 from saschagrunert/cri-tools $ PWD=/home/prow/go/src/k8s.io/release git branch --force master FETCH_HEAD $ PWD=/home/prow/go/src/k8s.io/release git checkout master Switched to branch 'master' $ PWD=/home/prow/go/src/k8s.io/release git submodule update --init --recursive # FAILED # Cloning kubernetes/kubernetes at master(b7c4d243de12a30bba02e23777c8ff1627263f89) # Checking out pulls: # 109111(810f695b2c07af6e9140b65320e1dc8c28b38bce) $ PWD=/ mkdir -p /home/prow/go/src/k8s.io/kubernetes $ PWD=/home/prow/go/src/k8s.io/kubernetes git init hint: Using 'master' as the name for the initial branch. This default branch name ... skipping 1082 lines ... Auto-merging staging/src/k8s.io/apiserver/go.sum Auto-merging staging/src/k8s.io/apiextensions-apiserver/go.sum Auto-merging go.sum Auto-merging go.mod CONFLICT (content): Merge conflict in go.mod Removing LICENSES/vendor/gopkg.in/tomb.v1/LICENSE Automatic merge failed; fix conflicts and then commit the result. # Error: exit status 1