git报错：Pull is not possible because you have unmerged files解决方法