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