http://www.rzrgm.cn/xinmengwuheng/p/7115549.html
合并到主干后git checkout 分支
git merge origin/master //fast-ward
git push