You say that moved to this model and away from git-flow because
"We were drawn to this model because of the level of control it
gives us over what we do and do not include in a given release, and it
ties in well with our use of Jira for issue tracking"
Just curious as to how git-flow did not provide this functionality
and control. We are using git-flow and Jira at my company and I have
not had any issues of this sort. Can you please elaborate?
How to bug fixes (not hotfixes) get incorporated. Are bugs treated
the same as features? If someone is in the middle of a feature and
finds that they need a certain bug fix how are you handling this?
Cherry-picking? merge, integrate, re-branch?
More information about text formats