> -----Original Message-----
> From: Daan Hoogland [mailto:daan.hoogl...@gmail.com]
> Sent: Thursday, October 23, 2014 1:31 AM
> To: dev
> Subject: Re: [PROPOSAL] Move to github PR only during moratorium on
> commit
>
> On Thu, Oct 23, 2014 at 10:22 AM, Rohit Yadav
> <rohit.ya...@shapeblue.com> wrote:
> > Hi,
> >
> >> On 23-Oct-2014, at 11:47 am, Animesh Chaturvedi
> <animesh.chaturv...@citrix.com> wrote:
> ...
> >> The approach for fixing issues in release branch first and master later is
> not practical as we may miss out commits not made into master and future
> release regressing without the fixes.
> >
> > By the same logic, if we fix by default on master only, the release branch
> may miss out commits.
>
> I sttrongly disagree with Animesh here and think Rohit is overlooking a
> simple fact. At the moment the branches are for 'stabalizing'.
> Fixing on master first is in direct contradiction with that.
>
> We have not been stabalizing 4.4. it contains bug that have during the
> release periods for 4.4.0 and 4.4.1 been fixed on master. That shouldn't
> have been allowed to happen.
[Animesh] Clearly we have disagreement. To avoid the issue that you mention
David had created forward branch for 4.2 and I found it useful and continued
with that approach in 4.3. With forward branch which are really staging it was
a simple merge of forward back to release branch. The other approach of merging
release branch into master work as well but in my opinion keeping master as the
default branch (with protection of course ) is simpler to understand and
creates less confusion
