[Scummvm-devel] Towards a new release branch model

[A. Milburn]

On Mon, May 30, 2011 at 02:38:20PM +0200, Max Horn wrote:
> for "Release branches" and "Hotfix branches". 

It's not very clear to me what you want to change from the current model,
if we're not going to insist on Feature branches. You're suggesting a
stable branch which we merge release branches into? Or that our
development branch must only contain features which are intended for
the next release? Or that we should merge all changes from release
branches back into the develop branch rather than doing what we do
now, which is applying fixes to the release branch and possibly
'better' but riskier fixes to the develop one? I am confused!

- fuzzie