用git做ios工程的版本管理,project文件经常会变,所以push或者pull的时候就会冲突,而且经常冲突。
git pull的时候能不能指定文件或者忽略project文件呢?
或者有什么其他方案呢?
学习是最好的投资!
Summarized the .gitignore of several XCode projects on github. The current .gitignore of our current project is as follows:
# files created by Xcode 3 or older *.pbxuser *.mode1 *.mode1v3 *.mode2v3 *.perspectivev3 *.xcclassmodel/ # files created by Xcode 4 xcuserdata/ # build products *.build/ build/ DerivedData/ # Misc .svn .DS_Store
.gitignore can be specified to ignore
Add a collection of gitgnore on github.
https://github.com/github/gitignore
Some files can not be added to the git project.
Summarized the .gitignore of several XCode projects on github. The current .gitignore of our current project is as follows:
.gitignore can be specified to ignore
Add a collection of gitgnore on github.
https://github.com/github/gitignore
Some files can not be added to the git project.