git合并冲突 error:Merging is not possible because you have unmerged files的解决方法
文章目录#事故现场#解决方法#事故现场$ git merge mastererror: 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 ma
·
#事故现场
$ git merge master
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提示有错误的文件,修改之后,添加有冲突的文件: git add [被修改的冲突文件], 最后,按照普通提交那样,提交有冲突的文件: git commit [修改后的冲突文件] -m “注释内容”
简单来说,就是用git diff
或者git status
查看哪些文件冲突,有冲突的会提示:
++<<<<<<< HEAD
++<<<<<<< new_branch
然后修改冲突的文件,修改完之后,保存。然后,git add
,最后git commit
更多推荐
已为社区贡献5条内容
所有评论(0)