git [fatal] hint: Pulling is not possible because you have unmerged files.hint: Fix them up in the ...
error: Pulling is not possible because you have unmerged files.
错误:无法提取,因为您有未合并的文件。
hint: Fix them up in the work tree, and then use 'git add/rm '
提示:在工作树中修改它们,然后使用'git add/rm '
hint: as appropriate to mark resolution and make a commit.
提示:根据需要标记解决方案并提交。
fatal: Exiting because of an unresolved conflict.
致命的:因未解决的冲突而离开
只需要我们如下步骤:
git status
查看状态,发现那个红字表明的unmerged的文件
git add unmerged文件的地址
提交文件到缓存区
(按住shfit键,右键文件,选择框里面有复制文件地址的选项,粘贴到git中,可能会有些多余的乱码,进行删除就行,最后呈现这样的地址"E:\c-language-learning\README.md")
git commit -m "注释"
给暂存区域生成快照并提交
git push
提交文件给远程端