dieter.adriaenssens at gmail.com
Tue Nov 23 13:38:47 CET 2010
2010/11/23 Michal Čihař <michal at cihar.com>:
> Dne Tue, 23 Nov 2010 05:18:53 -0500
> Marc Delisle <marc at infomarc.info> napsal(a):
>> Le 2010-11-23 05:03, Michal Čihař a écrit :
>> > Hi
>> > Dne Tue, 23 Nov 2010 10:55:57 +0100
>> > Dieter Adriaenssens <dieter.adriaenssens at gmail.com> napsal(a):
>> >> I noticed you created several branches preparing for the 3.4.0 release.
>> >> Are there any guidelines for merging? For instance, when I fix a bug
>> >> in QA_3_3, should it be applied to MAINT_3_4, QA_3_4 and master?
>> >> Or will from now on, only security fixes be applied to QA_3_3?
>> > As it will take some time to release 3.4, it makes sense to apply
>> > patches to both of them.
>> > The easiest way to do that is to commit to QA_3_3 first, then merge it
>> > to QA_3_4 and then to master:
>> > git checkout QA_3_3
>> > edit foo.php
>> > git add foo.php
>> > git commit -m 'Fix something'
>> > git checkout QA_3_4
>> > git merge QA_3_3
>> > git checkout master
>> > git merge QA_3_4
>> I would apply the fix to MAINT_3_4_0 too because it's just at alpha; the
>> same until this branch advances to the rc level.
> Indeed it should be there as well.
So for now, the order for merging should be QA_3_3 -> MAINT_3_4_0 ->
QA_3_4 -> master, if I'm not mistaken?
More information about the Developers