摘要： http://kasicass.blog.163.com/blog/static/39561920133294219374/创建测试仓库$ git init$ echo "line one" >> foo.txt$ git add foo.txt$ git commit -m "first comm... 阅读全文

摘要： 同事在使用git pull代码时，经常会碰到有冲突的情况，提示如下信息：error: Your local changes to 'c/environ.c' would be overwritten by merge. Aborting.Please, commit your changes or... 阅读全文