首先你有两个长期分支

• master
• develop

步骤分解

feature 功能分支

• git flow feature start toogle-theme

  • git checkout develop

  • git pull

  • git checkout -b feature/toogle-theme develop

• git flow feature finish toogle-theme

  • git checkout develop
  • git merge --no-ff feature/toogle-theme
  • git branch -d feature/toogle-theme
  • git checkout develop

release 预发布功能分支

具有新功能和必要的修复且通过测试

• git flow release start 1.1.5

  • git checkout -b release/1.1.5 develop

• git flow release finish 1.1.5

  • git checkout master

  • git pull

  • git merge --no-ff release/1.1.5

  • git tag -a 1.1.5

  • git checkout develop

  • git pull

  • git merge --no-ff release-1.1.5

  • git branch -d release-1.1.5

  • git checkout develop

hotfix

• git flow hotfix start missing-link
  • ...
• git flow hotfix finish missing-link
  • ...