diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..8e45d030
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.pbxproj merge=union