git 在pull的时候报错
在执行git的时候报:
error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm ’
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
1、这时候需要
原创
2021-01-29 15:19:42 ·
6631 阅读 ·
0 评论