Created
June 28, 2009 19:04
-
-
Save program247365/137348 to your computer and use it in GitHub Desktop.
Using Xcode with Git, from: http://shanesbrain.net/2008/7/9/using-xcode-with-git and suggestions from http://stackoverflow.com/questions/456403/can-git-be-integrated-with-xcode
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| *.pbxproj -crlf -diff -merge |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| # xcode noise | |
| *.mode1v3 | |
| *.pbxuser | |
| *.perspective | |
| *.perspectivev3 | |
| *.pyc | |
| *~.nib/ | |
| build/* | |
| # Textmate - if you build your xcode projects with it | |
| *.tm_build_errors | |
| # old skool | |
| .svn | |
| # osx noise | |
| .DS_Store | |
| profile |
Yeah that's right. I'm oldschool like that :)
That's good to know though, so I will give it a shot after reading the docs. Thanks for the pointers!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Sounds like you've created a project, and then added it to a .git repo after the fact. You may be better off, letting Xcode (4) do the work of merging/branching within it's interface, it will do the right things, and then you won't get the merge conflicts with those files.
You can view the documentation here: http://developer.apple.com/library/mac/#documentation/ToolsLanguages/Conceptual/Xcode4UserGuide/SCM/SCM.html#//apple_ref/doc/uid/TP40010215-CH7-SW9
Also the Developer forums is a good place to get help if you're an official iOS/Mac developer.