git merge origin master //将origin merge 到 master 上 git merge origin/master //将origin上的master分支 merge 到当前 branch 上 相关文章: 2022-12-23 2021-12-14 2022-12-23 2022-01-01 2021-05-02 2021-11-30 2021-07-13 2022-12-23