git 修改远程仓库的分支名称
git checkout -b new-branch
git pull origin old-branch
git push origin new-branch
git push --delete old-branch
Your local changes to the following files would be overwritten by merge 解决方案
如何pull代码的时候不产生这条记录。
git stash #封存修改
git pull origin master
git stash pop #把修改还原
