git pull报错 error: Your local changes to the following files would be overwritten by merge

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

方案1：尝试了stash ，不行

方案2：copy文件a 命名为 a-2021_03_04_11_11_43.xx  然后checkout a文件 再去push

方案3：复制项目更新内容 重新拉取然后复制后提交(不推荐)