(1)新建远程分支,https://github.com/username/name.git为原项目地址
git remote add upstream https://github.com/username/name.git
(2)更新远程代码到本地
git fetch upstream
(3)存储本地修改
git stash
(4)合并代码
git merge upstream/master
(1)新建远程分支,https://github.com/username/name.git为原项目地址
git remote add upstream https://github.com/username/name.git
(2)更新远程代码到本地
git fetch upstream
(3)存储本地修改
git stash
(4)合并代码
git merge upstream/master
转载于:https://my.oschina.net/vcship/blog/3021207