From 57a152ca404e739b8d123eeebfb618cb09dd6aa0 Mon Sep 17 00:00:00 2001
From: Ryan Hitchman <rmmh@google.com>
Date: Wed, 2 Nov 2016 14:51:29 -0700
Subject: [PATCH] Disable the test-owners verify step until the merge conflicts
 are resolved.

Fixes #35850.

GitHub's merging doesn't support .gitattributes-- I verified this with
support. There may be a workaround with line padding or making the bot
do merges on its own, which is beneficial for custom merge conflict
resolution in general.
---
 hack/verify-test-owners.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hack/verify-test-owners.sh b/hack/verify-test-owners.sh
index f9e07b653b7..4615c91b310 100755
--- a/hack/verify-test-owners.sh
+++ b/hack/verify-test-owners.sh
@@ -20,8 +20,10 @@ set -o pipefail
 export KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
 source "${KUBE_ROOT}/hack/lib/init.sh"
 
+
 cd "${KUBE_ROOT}"
 if ! hack/update_owners.py --check; then
     echo 'Run ./hack/update_owners.py to fix it'
+    exit  # TODO(rmmh): fix Github merging to respect .gitattributes
     exit 1
 fi