用git做版本管理,对于经常修改的文件怎么办
PHPz
PHPz 2017-04-21 10:57:30
0
4
679

用git做ios工程的版本管理,project文件经常会变,所以push或者pull的时候就会冲突,而且经常冲突。

git pull的时候能不能指定文件或者忽略project文件呢?

或者有什么其他方案呢?

PHPz
PHPz

学习是最好的投资!

reply all(4)
左手右手慢动作

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
Peter_Zhu

.gitignore can be specified to ignore

阿神

Add a collection of gitgnore on github.

https://github.com/github/gitignore

PHPzhong

Some files can not be added to the git project.

Latest Downloads
More>
Web Effects
Website Source Code
Website Materials
Front End Template