Is anyone doing the Release Flow branching strategy that would mind providing guidance? I’ve used gitflow and GitHub flow before, but never Release Flow, so I only know what I’m reading online. I’ve drawn up some mockups of how I understand it.
Is it better to:
- Do bugfixes on the release branches themselves?
- Do bugfixes on main and cherry-pick to release branches?
#2 seems simpler, but seems like you could end up with strange merge conflicts due to the feature changes on main that do not exist in the release branch. Any suggestions would be appreciated.