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