AGit-flow 方式只有一条master分支，怎么做hotfix/ 版本修复

alibaba / git-repo-go

git-repo is a command-line tool for centralized workflow, can work with Gerrit, AGit-Flow compatible servers. It is written in Golang, and it can be installed easily without further dependency. It provides an easy-to-use solution for multiple repositories which is introduced by Android repo first, and it can also work with a single repository.

https://git-repo.info/

Apache License 2.0

272 stars 60 forks source link

AGit-flow 方式只有一条master分支，怎么做hotfix/ 版本修复 #25

Closed chenweiyj closed 3 years ago

chenweiyj commented 3 years ago

AGit-flow 方式只有一条master分支，怎么做hotfix/ 版本修复。如果要hotfix修复，而master继续接收新功能的合并请求，hotfix修复好了怎么打hotfix的标签？

jiangxin commented 3 years ago

AGit-Flow 模式和分支开发模式当然可以共存。推送到 refs/for/master/<topic> 发起功能开发的评审，推送到 refs/for/release/<topic> 发起向 release 分支的代码评审，即 hotfix。多人协同的特性开发，仍然可以使用特性分支模式。如下图所示：