1.DS_store错误
1.禁止.DS_store生成:
打开 “终端” ,复制黏贴下面的命令,回车执行,重启Mac即可生效
defaults write com.apple.desktopservices DSDontWriteNetworkStores -bool TRUE
2.恢复.DS_store生成:
defaults delete com.apple.desktopservices DSDontWriteNetworkStores
3.删除 .ds_sore的方法
sudo find / -name “.DS_Store” -depth -exec rm {} \;
2.You have not concluded your merge (MERGE_HEAD exists).
Please, commit your changes before you can merge.
1.If you are sure that you already resolved all merge conflicts:
rm -rf .git/MERGE*
2.git add file
git commit