image.png
image.png

  • git merge —no-ff feature-xx

image.png

git flow avh

  • git flow init -d:直接初始化git flow
  • git flow feature start feature-xxx:依据develop创建feature
  • git flow feature publish:push feature到远端
  • git flow feature finish feature-xxx:合并到develop,删除feature
  • git push -u origin develop:传统命令,push develop分支

  • git flow release start release-0.1.0:根据develop创建release

  • git flow release finish release-0.1.0:
    • image.png
  • git push —tags【为什么没有集成到上一步】

  • git flow hotfix start hotfix-0.1.1:创建分支

  • git flow hotfix publish hotfix-0.1.1:发布到远程
  • git flow hotfix finish hotfix-0.1.1:结束工作
    • image.png