我们在工作中,必要切换到别的一个分支,拉取代码的时候会报如许的题目:
Pulling 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. Exiting because of an unresolved conflict.