diff options
| author | Teddy Wing | 2016-12-01 13:11:03 -0500 |
|---|---|---|
| committer | Teddy Wing | 2016-12-01 13:11:03 -0500 |
| commit | 7980da615060b19e52f7e0c9e97835259f2f9901 (patch) | |
| tree | 2477fc126d09acc627c29231c134e3ab15810636 | |
| parent | 135cc2889ee7878a58ed2e1e5be7d5bc4f154137 (diff) | |
| download | Low-Battery-Yup-7980da615060b19e52f7e0c9e97835259f2f9901.tar.bz2 | |
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.
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..8e45d03 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.pbxproj merge=union |