1、dev分支,提交相关代码
git add .
git commit -m ‘dev'
git push -u origin dev
2、切换到master分支,拉取最新代码,合并
git checkout master
git pull origin master
git merge dev
3、查看状态,push到远程服务器
git status
git push origin master
dev合并到主干master完成
git add .
git commit -m ‘dev'
git push -u origin dev
git checkout master
git pull origin master
git merge dev
git status
git push origin master
dev合并到主干master完成