Git branch modeling

There is a really good reference : http://nvie.com/posts/a-successful-git-branching-model/

There are two central repo (remote) branches with an infinite lifetime.

• master
• develop

There are three limited lifetime branches.

• feature branches
• release branches (named as "branch-{minor version}" )
• hot-fixes (named as "hotfix-{revision version}" )

if there is a hot-fix issue and at the same time there is a existed release branch, it needs to be merged into the release branch. otherwise, needs to be merged into develop.