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