Your local changes to the following files would be overwritten by merge放弃本地修改，直接覆盖1 git reset --hard 2 git pull版权声明：本文为yaoyao66123原创文章，遵循CC 4.0 BY-SA版权协议，转载请附上原文出处链接和本声明。原文链接：https://blog.csdn.net/yaoyao66123/article/details/125552077