美文网首页
DS_Store冲突

DS_Store冲突

作者: better栋 | 来源:发表于2017-03-27 21:43 被阅读0次

The files .DS_Store and .DS_Store had a tree conflict error from Git 

# remove any existing files from the repo, skipping over ones not in repo

find . -name .DS_Store -print0 | xargs -0 git rm --ignore-unmatch

# specify a global exclusion list

git config --global core.excludesfile ~/.gitignore

# adding .DS_Store to that list

echo .DS_Store >> ~/.gitignore

相关文章

网友评论

      本文标题:DS_Store冲突

      本文链接:https://www.haomeiwen.com/subject/klkdottx.html