随笔分类 -  Git

git发生冲突:error: Your local changes to the following files would be overwritten by merge
摘要：当使用 git pull 拉取代码时发生冲突报错： error: Your local changes to the following files would be overwritten by merge: xxx/xxx.php Please commit your changes or st 阅读全文
posted @ 2020-04-20 14:52 我是东山呀 阅读(511) 评论(0) 推荐(1)