Our current project is relatively complex, with several Features in progress at the same time. Assume that F1 and F2 are merged into Develop at the same time. Will this generate many Release branches? If there is only one Release branch, both of them include Modifications of F1 and F2 have been made. Suppose that after the developers of F2 have tested the functions of F2 and feel that there is no problem, they publish it to the Master. This does not mean that F1 Are the functions confused....
![[Web front-end] Node.js quick start](https://img.php.cn/upload/course/000/000/067/662b5d34ba7c0227.png)
After the completed functions are merged into develop for testing feature => develop
Testing completed, merge feature => master
Release, merge master=> release
Hot patch, cut a hotfix branch from master, repair is completed, merge hotfix => develop for testing; test is completed, merge hotfix => master hotfix => release
F1, F2 merged into develop has nothing to do with how many releases are generated. There will only be one release branch
The release branch is based on develop, which means that F1 and F2 must be included during testing
After the release branch is completed, it is merged into master, which means that F1 and F2 must enter master
If you want to only test F2 and release F2 this time, then don’t merge F1 into develop