[Scummvm-devel] Towards a new release branch model

[Max Horn]

Am 30.05.2011 um 14:38 schrieb Max Horn:

> Hi there,
> 
> now that 1.3.0 is out, we should think about how we will handle future releases (maybe except for 1.3.1, if there is any).
> 
> The very first thing I would like to see changed: Let's not name any branches like "branch-1-4-0" anymore. An appropriate name would be "branch-1-4-x" or "branch-1-4" or "branch-1.4" or "branch_1_4" or *whatever*, just nothing that says "1.4.0" but doesn't mean it :).
> 
> However, I really think the whole branching model should change. Here is a rough sketch of how things might work in the future.
> 
> Basically, I agree with what some people suggested in the past: Let's try to follow the model described on
> 
>    <http://nvie.com/posts/a-successful-git-branching-model/>

PS: He also made some tools available that help following that model, see
  <https://github.com/nvie/gitflow>
  <http://jeffkreeftmeijer.com/2010/why-arent-you-using-git-flow/>


Cheers,
Max