Before release a new version of the software, which is a web application, my company creates a
release branch. The QA team tests that branch and reports some issues. Should developers commit the fixing code to that
release branch or a new
bugfix branch that is merged to the
release branch later?
For more details, my company currently use a modify version of gitflow model. We release new version every two week.
feature branches are not merged to the
dev branch but to the
release branch at the beginning of the release process. Developers commit their fixing code to the
release branch to fix issues raised by QA team and these code sometimes introduce new more issues. That is the reason why I think we should have another
bugfix branch collects all fixes for bugs that are raised from testing the
release branch. After all bugs are fixed, the
bugfix branch is merged to the
release one and the QA team start testing the
release branch another time. The
release branch can be tested several times until there is no bug to fix.