diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000000..23c9c5a48c3
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+gradle.properties merge=ours
+