xiaokang06的专栏

同事在使用git pull代码时，经常会碰到有冲突的情况，提示如下信息：error: Your local changes to 'c/environ.c' would be overwritten by merge. Aborting.Please, commit your changes or stash them before you can merge.这个意思是说更新下来的内

git branch develop 新建分支git branch 查看分支 develop * mastergit checkout develop 切换到develop分支下git branch 查看分支 * develop mastergit push origin develop 把当前分支下的文件拷贝到远程服务器上的develop下git pu...