Git merge workflow: reverse it?

[Albert Astals Cid]

El dimecres, 12 d’agost de 2020, a les 22:42:37 CEST, Albert Astals Cid va escriure:
> Would it make sense to do an Akademy BoF about this to try to get more than 3 people to decide on it?

So we didn't have an Akademy BoF.

I need clear messaging on this, so we can tell people clear messaging that i will or will not be doing stable to master merging for the 20.12 releases branching.

Cheers,
  Albert

> 
> Cheers,
>   Albert
> 
> El dimecres, 29 de juliol de 2020, a les 14:01:07 CEST, Bhushan Shah va escriure:
> > Hello everyone!
> > 
> > At plasma, we are experimenting with new workflow regarding how bugfixes
> > are put on the stable branch [1].
> > 
> > # Previous workflow
> > 
> > - Current workflow is that we commit to stable branch and then merge it
> >   upwords until master branch
> > - i.e commit to Plasma/5.18 branch, merge 5.18 into 5.19 and then
> >   master
> > 
> > # Current workflow
> > 
> > - Proposed workflow is to instead commit all changes in master, and
> >   cherry-pick related changes in the stable branch as needed
> > - We had been using this workflow for about 1 month now and I'd say it
> >   is working nicely for us.
> > 
> > # Why?
> > 
> > We occasionally hit several issues with previous workflow,
> > 
> > - Merge conflicts when merging changes upwords
> > - Changes which are valid only for stable branch needs to be reverted in
> >   master branches. So you end-up with, stable-fix, revert of stable fix
> >   and then different fix and overall weird history.
> > - Accidential merges from the master branch to stable branch which
> >   needs to be force-resetted.
> > - It's worth noting that Qt also recently changed to merge to dev,
> >   cherry-pick backwards.
> > - This also allows for workflows where we want to commit some bugfix in
> >   the master branch for few days/weeks and if it works fine in general
> >   testing then, cherry-pick it in stable branches.
> > 
> > Proposal is to probably adapt this policy kde-wise if people feel that
> > advantages are worth it.
> > 
> > Thanks
> > 
> > [1] https://mail.kde.org/pipermail/plasma-devel/2020-June/117887.html
> > 
> > 
> 
> 
> 
> 
>