PyCharm gitee: Git Pull Failed

PyCharm gitee: Git Pull Failed

Your local changes will be overwritten by merge. Commit, stash, or revert them to proceed.View them

 

 

Local Changes Prevent from Pull

 

解决方法：

在资源管理器中，手工删除文件夹 

 

 

 

然后设置   参考这个设置: https://www.cnblogs.com/emanlee/p/19229101