分支开发

(dev)$: git checkout -b feature/xxx            # 从dev建立特性分支
(feature/xxx)$: blabla                         # 开发
(feature/xxx)$: git add xxx
(feature/xxx)$: git commit -m 'commit comment'
(dev)$: git merge feature/xxx --no-ff          # 把特性分支合并到dev

删除分支

$ git branch -d feature/xxx                    # 删除本地分支
$ git push origin --delete feature/xxx         # 删除远程分支