git -------- pull更新错误解决办法

Your local changes to the following files would be overwritten by merge error: Your local changes to ...