分支管理
下面是我在平安整理的分支管理方案-项目采用敏捷开发的方式进行，
|
时间节点 |
分支操作 |
执行人 |
|
Sprint 启动 |
Master -> fieldX |
master |
|
开发阶段 |
fieldX –> fieldX_name |
developer |
|
提测前冒烟 |
Merge fieldX_name into fieldX |
developer |
|
提测 |
Merge fieldX into develop |
developer |
|
ST部署 |
develop |
developer |
|
修改bug |
Merge fieldX into develop |
developer |
|
Sprint 完成 |
fieldX protected fieldX_name delete |
master |
|
anHouse |
Merge develop into master |
master |
|
anHouse 部署 |
master |
master |
|
anHouse测试通过 |
Tag master_anhouse_20190606xxxx |
master |
|
修改anHouse bug |
Master Tag -> master_anhouse_hotfix_20190701 |
developer |
|
ST部署 （hotfix） |
master_anhouse_hotfix_20190701 |
developer |
|
anHouse （hotfix） |
master_anhouse_hotfix_20190701 |
master |
|
anHouse 测试通过（hotfix） |
Tag master_anhouse_20190606xxxx Merge master_anhouse_hotfix_20190701 into master |
master |
|
GA |
同anHouse |
|
|
|
|
|
