简单版:
git remote add upstream https://git.xxx-dev.com/develop2/mcomb-front.git
git fetch upstream
git merge upstream/develop
git push origin develop
一直用sourcetree管理git项目,往往会忽略命令行相关命令,实际上命令使用会更加好用。
以本人项目为例:fork某个项目后,当源项目更新后,你fork的分支并不会一起更新,需要自己手动去更新。
colne我fork的分支
git clone https://git.xxx-dev.com/zhangyf/mcomb-front.git
增加远程原始分支到本地
(可以用 git remote -v 命令查看远程分支列表)
git remote -v
origin https://git.xxx-dev.com/zhangyf/mcomb-front.git (fetch)
origin https://git.xxx-dev.com/zhangyf/mcomb-front.git (push)
如果没有远程原始分支则需要增加:
增加 然后git remote -v 查看
git remote add upstream https://git.qilu-dev.com/develop2/mcomb-front.git
git remote -v
origin https://git.qilu-dev.com/zhangyf04/mcomb-front.git (fetch)
origin https://git.qilu-dev.com/zhangyf04/mcomb-front.git (push)
upstream https://git.qilu-dev.com/develop2/mcomb-front.git (fetch)
upstream https://git.qilu-dev.com/develop2/mcomb-front.git (push)
fetch原始源分支的新版本到本地
git fetch upstream
From https://git.xx-dev.com/develop2/mcomb-front
* [new branch] develop -> upstream/develop
* [new branch] master -> upstream/master
合并
git merge upstream/develop
把最新的代码提交到自己账户
git push origin develop