2015年8月12日
"Your local changes to the following files would be overwritten by merge" on git
摘要： 运行: git merge --ff origin/master得到错误信息：error: Your local changes to the following files would be overwritten by merge: dir/file1 dir/file2 dir/file... 阅读全文
posted @ 2015-08-12 17:50 Waichung 阅读(500) 评论(0) 推荐(0) 编辑