1. 创建分支并切换到该分支：git checkout -b <branchName>
$ git checkout -b trunk Switched to a new branch 'trunk'
相当于执行以下命令：
$ git branch trunk $ git checkout trunk
2. push分支到远程：
$ git push --set-upstream origin trunk
3. 当开发完成后，合并分支代码至master：git2 merge <branchName>
$ git merge trunk Updating ac0376e..dbd2d0f Fast-forward trunk.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 trunk.txt
4. 有冲突解决冲突，没有则push合并代码至master：git push origin master
$ git2 push origin master Total 0 (delta 0), reused 0 (delta 0) To https://github.com/maosea0125/imgable-behavior.git ac0376e..dbd2d0f master -> master
5. 分支任务已完成，删除trunk分支：git branch -d <branchName>
$ git branch -d trunk Deleted branch trunk (was dbd2d0f).
6. push删除操作至远程：git push origin –delete <branchName>
$ git push origin –delete trunk
To https://github.com/maosea0125/imgable-behavior.git
– [deleted] trunk