當clone完版本庫,切換到開發分支后,使用git pull -r 拉取並合並分支之后會出現一下提示:
$ git pull -r
From ssh://192.168.1.226:29418/ethank-server
bc86d14..b72fc88 dev -> origin/dev
There is no tracking information for the current branch.
Please specify which branch you want to rebase against.
See git-pull(1) for details
git pull <remote> <branch>
If you wish to set tracking information for this branch you can do so with(此分支設置跟蹤信息):
git branch --set-upstream-to=origin/<branch> dev
這是由於本地分支並沒有和遠程分支進行關聯,關聯之后會在.git/config中增加 一下類似的條目:
[branch "master"]
remote = origin
merge = refs/heads/master
我們根據提示執行命令:git branch --set-upstream-to=origin/dev dev
執行后.git/config文件中會增加:
[branch "dev"]
remote = origin
merge = refs/heads/dev
之后就可以使用git pull -r
但如果手動先git fetch 然后再git rebase origin/dev 手動合並就不會彈出錯誤提示 ,
建議還是使用git branch --set-upstream-to關聯遠程分支