[Libreoffice] Merging release branch(es) into master [was: Re: ooo/OOO330_m14 merged into libreoffice-3-3]

Jan Holesovsky kendy at suse.cz
Fri Nov 12 09:06:04 PST 2010


On 2010-11-12 at 00:31 +0100, Miklos Vajna wrote:

> > > Either we can merge the entire libreoffice-3-3 there, or we can merge
> > > just ooo/OOO330_m14, and continue cherry picking between master and
> > > libreoffice-3-3.
> > 
> > +1 for merging libreoffice-3-3
> Sure, other projects are doing it like this already, i.e git.git has the
> same policy (features go to master, fixes to maint, then maint is merged
> to master regularly).

Based on this feedback, I did it :-)  I only reverted Tor's workaround
for the Windows version crasher at exit, so that it is still visible in
master, and it can get the proper attention.

More information about the LibreOffice mailing list