[Development] Merging patches to old/5.0 or old/5.1 branches
thiago.macieira at intel.com
Mon Nov 4 18:49:48 CET 2013
On segunda-feira, 4 de novembro de 2013 09:15:59, Thiago Macieira wrote:
> On segunda-feira, 4 de novembro de 2013 17:25:46, Oswald Buddenhagen wrote:
> > so we make them cherry-pick branches without CI. what then? would you
> > insist on forward-merging them to stable?
> Not necessary, since it's a fix that has already been through the CI in the
> next branches.
To be clear: it's not necessary to use the merge to bring the changes in to
the stable branch, since they're already there.
But if we do some changes in those branches, we'd want to merge after tagging
so they exist in the normal history.
Thiago Macieira - thiago.macieira (AT) intel.com
Software Architect - Intel Open Source Technology Center
-------------- next part --------------
A non-text attachment was scrubbed...
Size: 190 bytes
Desc: This is a digitally signed message part.
More information about the Development