在使用git的时候，没有提前git pull，就把自己本地修改的文件git add、git commit，就会出现“ ... you have unmerged files.”的error。参考链接：http://stackoverflow.com/questions/22386030/cannot-checkout-file-is-unmerged
解决办法：
1、cat ＋文件名
2、git add file
3、git commit -m "fix conflict"
4、 git push
5、之后，再打开本地项目的时候会出现，报错提示： cannot be opened because the project file cannot be parsed. 解决办法：.xcodeproj文件显示包的内容，删除“<<<<<<<,======,>>>>>>”部分，保存。重新打开即可。具体解决链接 http://blog.csdn.net/mengmakies/article/details/51473156。
在使用git的时候，没有提前git pull，就把自己本地修改的文件git add、git commit，就会出现...
1. Pull is not possible because you have unmerged files. ...
Committing is not possible because you have unmerged file...
Do you have broken voice memo files?You can fix those fil...
install: config: push files to git You should make a repo...
解决Git报错:error: You have not concluded your merge (MERGE_H...
输入 git clone 命令时出现Please make sure you have the correct a...
刚刚安装了git，然后git clone码云的项目，提示“please make sure you have th...
Git 问题记录 1.fatal: You have not concluded your merge (MERG...
1.git pull时报错 error: You have not concluded your merge (M...
本文标题：git“ ... you have unmerged files
本文链接：https://www.haomeiwen.com/subject/dggixxtx.html
网友评论