From 7980da615060b19e52f7e0c9e97835259f2f9901 Mon Sep 17 00:00:00 2001
From: Teddy Wing
Date: Thu, 1 Dec 2016 13:11:03 -0500
Subject: Add .gitattributes for merging Xcode *.pbxproj

Automatically merge this file. I got conflicts in it trying to do a
merge and it seemed like a bad time. Not conflicts I should be resolving
myself manually.

Got the tip from a Stack Overflow answer by Josh Brown:
http://stackoverflow.com/questions/31541624/merge-conflicts-with-project-pbxproj-on-git-xcode-ios/32567843#32567843

According to this, though:
http://stackoverflow.com/questions/12907605/xcode-project-file-git-merge-conflict
that won't work in all cases. We'll try it anyway and hope for the best.
---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..8e45d03
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.pbxproj merge=union
-- 
cgit v1.2.3