PyCharm gitee: Merge with strategy ort failed.

__pycache__/views.cpython-36.pyc SPDmanage/__pycache__/views.cpython-38.pyc SPDmanage/migrations/__pycache__/0001_initial.cpython-36.pyc SPDmanage/migra
Merge with strategy ort failed.

 参考这个解决：

（1）删除全部文件夹    __pycache__

（2）设置：  https://www.cnblogs.com/emanlee/p/19229101

posted @ 2025-11-16 21:48  emanlee  阅读(9)  评论(0)    收藏  举报