PR | kevindelgado: Server-Side Apply status wiping |
Result | FAILURE |
Tests | 0 failed / 0 succeeded |
Started | |
Elapsed | 0.00s |
Revision | |
Refs |
99661 |
Environment setup # FAILED # Cloning kubernetes/kubernetes at master(6d499e67685e2c004597cb3f617ce51a3b639211) # Checking out pulls: # 99661(2bc9b28036bc92ebcc2a4d1b8b916ced86ae8a19) $ mkdir -p /home/prow/go/src/k8s.io/kubernetes $ git init Initialized empty Git repository in /home/prow/go/src/k8s.io/kubernetes/.git/ ... skipping 805 lines ... Auto-merging pkg/registry/core/pod/strategy.go Auto-merging pkg/registry/batch/job/strategy.go CONFLICT (content): Merge conflict in pkg/registry/batch/job/strategy.go Auto-merging pkg/api/pod/util.go Auto-merging api/openapi-spec/swagger.json Auto-merging api/api-rules/violation_exceptions.list Automatic merge failed; fix conflicts and then commit the result. # Error: exit status 1