search

Home  >  Q&A  >  body text

用git做版本管理，对于经常修改的文件怎么办

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

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

或者有什么其他方案呢？

PHPzPHPz2801 days ago693

reply all(4)I'll reply

  • ringa_lee

    ringa_lee2017-04-21 10:59:30

    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

    reply
    0
  • 天蓬老师

    天蓬老师2017-04-21 10:59:30

    .gitignore can be specified to ignore

    reply
    0
  • 阿神

    阿神2017-04-21 10:59:30

    Add a collection of gitgnore on github.

    https://github.com/github/gitignore

    reply
    0
  • PHPz

    PHPz2017-04-21 10:59:30

    Some files can not be added to the git project.

    reply
    0
  • Cancelreply