1.假如我们现在在dev分支上,开发完需求后,推送代码
git add .
git commit -m ‘dev' && git commit --no-verify -m 'dev' //跳过eslint代码检查
git push -u origin dev
2.推送完代码后,把代码合并到指定分支(master)
git checkout master
3.为了保险与指定分支(master)代码一致,先拉一下
git pull origin master
4.合并 (master)
git merge dev
5.合并完查看当前状态
git status
Your branch is ahead of 'origin/master' by xxx commits. //表示你有xxx个commits
6.推送代码
git push origin master