Re: git branch strategy after 1.11

[Jan Engelhardt]

On Sunday 2009-03-22 12:23, Ralf Wildenhues wrote:

>Hello everyone,
>
>just to let you know, after 1.11 I intend to change the branch setup a
>bit.  When branch-1-11 is created, I will also create a branch maint,
>which will then receive bug fixes appropriate for both 1.11.x and 1.11a.
>The maint branch will then be merged regularly (most likely after every
>commit or set of commits) into both branch-1-11 and master.

Perhaps use a dot? e.g. "branch-1.11".

And: once branch-1.11 development finally ceases, it can be deleted.
This works because the commits remain reachable via the release tags.
If necessary, the branch pointer can simply be recreated.

>An alternative naming strategy would be maint-1-11.  That way it would
>be simpler to add bugfixes to branch-1-10 even after the maintenance
>branch has moved to the branch-1-12 branch point.  OTOH, if we want to
>fix things in old branches, we can always open up a new oldmaint or
>maint-X-Y branch then.