git上传到版本库报错：Pull is not possible because you have unmerged files（已解决）