您的位置: 首页 > IT文章 > Your local changes to the following files would be overwritten by merge: Your local changes to the following files would be overwritten by merge: 分类: IT文章 • 2022-06-12 12:51:47 在服务器改动之后,用sourcetree提交会产生冲突,解决办法: git reset --hard git pull origin master