diff --git a/hack/verify-flags/.gitattributes b/hack/verify-flags/.gitattributes
new file mode 100644
index 00000000000..c04e4626951
--- /dev/null
+++ b/hack/verify-flags/.gitattributes
@@ -0,0 +1 @@
+known-flags.txt merge=union