一 、Check out, review, and merge locally
从远程分支拉取某个分支
git fetch origin
git checkout -b feature/xxx-20170815 origin/feature/xxx-20170815
切换到开发分支,把改动的分支merge到开发分支
git checkout dev
git merge --no-ff feature/xxx-20170815
把开发分支push到服务器
git push origin dev
拉取某个commit的代码卡
git checkout -b xxx-name commit_id(提交的哈希值)