As with most things branching... "it depends"... and there are options. You could make the hotfix to the prod branch and get it out the door, then move it back to Test and Main (if they needed it). You could cut a branch from prod to address the specific "fixes". You have many paths. In general if this is happening all the time (every release) you might introduce a fixes branch from the beginning or choose a different model.
↧