Is there a good solution for repairing BUG on git flow release

I recently considered whether to introduce git flow workflow to the project team, using the git flow tool built into the sourcetree tool (which can reduce the cost of learning), but when using it, I found some problems in the flow process and workflow.

Workflow: functional requirements, functional development, functional testing, merging, fixing problems, releasing versions, centralized testing, fixing problems, launching

I tested the gitflow workflow and found that the release branch can only be modified on the current release, which is bound to deviate from the idea of a BUG branch. For example, if I find 10 BUG, features that belong to 5 people in the release, then all five people will have to fix them on the current release branch, and the process is not very bad.

the company does not adopt agile development, and the cost of Fork workflow is high. Do you have any good suggestions? if you manually create a repair branch on the release branch, you might as well use a single develop branch, and then create all the branches above and all the BUG, branches are merged from develop to develop.

Mar.19,2021

each Bug/Hotfix has its own branch ( git flow hotfix start ). After this branch is completed and tested, merge it into dev or release ( git flow hotfix finish ), and then publish

.
Menu