Git和XCode：合并.xcodeproj会发出二进制警告

Question

I am working with branches and wanting to merge with my master, but the files inside of my .xcodeproj are causing huge issues.

Constantly getting errors about overriding them, that they are binary files, etc etc.

What do I need to do to never have to worry about this? It is driving me nuts!

NOTE: I have a .gitignore file in my master that ignores these files, but not in my branch. Not sure what to do about that.

Answer 1

In the root of the project (eg, same directory as .git ), add a git ignore file

.gitignore

With a line that says

.xcodeproj

Then remove the .xcodeproj file from the repo...

git rm --cached /path/to/.xcodeproj

Then add the .gitignore file

git add .gitignore

Then commit

git commit -m "Removed .xcodeproj; added ignore pattern to excluded it"

Answer 2

您可以使用.gitignore文件来指定git忽略的文件。