git merge origin master git merge origin/master区别 git merge origin master //将origin merge 到 master 上 git merge origin/master //将origin上的master分支 merge 到当前 branch 上