Organization have following delivery scenario:
- Major release every quarter or so
- Minor release (features, bugs) every month or so
- Hotfixes - as required.
We adopted Advance Branch Plan, but had some issues merging one change from Hotfix to the Development branch (changeset merge a.k.a. cherry picking). Issue came from the merging files changed in both Hotfix and Servicing branches.
As a result following change to the branching strategy was suggested:
That approach will address cherry picking issues, but will require lots of branches to deal with features, hotfixes and critical issues.
I was hoping to get an advice and rational explanation which option should be the best choice for our situation.