langyuedeMini:InteligencePark langyue$ git pull
remote: Counting objects: 86, done.
remote: Compressing objects: 100% (85/85), done.
remote: Total 86 (delta 47), reused 0 (delta 0)
Unpacking objects: 100% (86/86), done.
From git.langyue.org:LiuLongChang/InteligencePark
1775014..387f273  master    -> origin/master
error: The following untracked working tree files would be overwritten by merge:
.DS_Store
Please move or remove them before you merge.
Aborting

2168300-58a5bada6757a5be.png

解决办法：

rm .DS_Store
git add -A
git commit -m "Added .gitignore file"

参考：git - strange branch merge error that i am not sure how to solve