git合并的时候，冲突问题Merging is not possible because you have unmerged files
#git mergeerror: Merging is not possible because you have unmerged files.hint: Fix them up in the work tree, and then use 'git add/rm <file>'hint: as appropriate to mark resolution and make ...
·
#git merge
error: Merging is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
用git diff或者git status 查看哪些文件冲突，有冲突的会提示：
++<<<<<<< HEAD
++<<<<<<< new_branch
修改(Vim)你的冲突的文件，修改完之后，保存。
用git add xxx，把你修改的文件全部都添加进去。
最后，用git commit -a -m ” 备注信息 ” 提交，完成。
瓜分20万奖金 获得内推名额 丰厚实物奖励 易参与易上手
更多推荐
2
0- 0
已为社区贡献1条内容
所有评论(0)