首先切换到master分支上
git checkout master
将最新代码pull下来
git pull origin master
将分支**合并到master上
git merge **
查看状态是否合并成功
git status
- 一般显示这个就操作成功了
Your branch is ahead of ‘origin/master’ by 8 commits.
最后将代码push到远程master上
git push origin master