GitFlow

o_git-flow-nvie.png

@startuml
participant develop

activate feature
develop -> feature : 开发: git flow feature start login

feature --> develop : 合并: git flow feature finish login
deactivate feature

activate release
develop -> release : 提测 git flow release start v3.0.0r80

activate master
release -> master : 进入发布阶段 : git flow release finish v3.0.0r80
release --> develop : 合并到develop，进入下一个迭代
deactivate release
master -> master : 打tag : v3.0.0r80
activate hotfix
master --> hotfix : git flow hotfix start v3.0.1r81
hotfix -> master : 发布 git flow hotfix finish v3.0.1r81
hotfix -> develop : 合并到develop，进入下一个迭代
deactivate hotfix
master -> master : 打tag:v3.0.1r81

deactivate master
@enduml

gitflow.png