分支开发

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

删除分支

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