git pull error: Pulling is not possible because you have unmerged files.hint: Fix them up in the ...

git pull 报错如下 解决方案如下

PS F:\jy\juyi_dataplat_web> git pull

error: Pulling is not possible because you have unmerged files.
错误:无法提取，因为您有未合并的文件。

hint: Fix them up in the work tree, and then use 'git add/rm <file>'
提示:在工作树中修改它们，然后使用'git add/rm '

hint: as appropriate to mark resolution and make a commit.
提示:根据需要标记解决方案并提交。

fatal: Exiting because of an unresolved conflict.
致命的:因未解决的冲突而离开。

只需要我们如下步骤

git add .
//提交所有
git status
//查看状态
git commit -m "new version"
//"new version"  " "写点你想写的注释 
git push 
//提交