【git】
关注
分享
扫一扫
SteamPY
这个作者很懒，什么都没留下…
展开
专栏收录文章
- 默认排序
- 最新发布
- 最早发布
- 最多阅读
- 最少阅读
-
git使用error: Your local changes to the following files would be overwritten by merge:
error: Your local changes to the following files would be overwritten by merge: device/huaqin/hq8382_tb_b1a_l/ProjectConfig.mk Please, commit your changes or stash them before you can merge. Aborti原创 2015-05-27 13:43:57 · 4522 阅读 · 0 评论 -
git错误解决：error: The following untracked working tree files would be overwritten by merge:
解决git冲突造成的Please move or remove them before you can merge git clean -d -fx "" 其中 x -----删除忽略文件已经对git来说不识别的文件 d -----删除未被添加到git的路径中的文件 f -----强制运行原创 2015-05-14 14:08:41 · 28590 阅读 · 1 评论