Re: Git merge workflow: reverse it?

2020-08-14 Thread Nate Graham
FWIW I'm a +1 too. Having done both, I solidly prefer the cherry-pick workflow. It's so much less error-prone, and you don't need to deal with the hassle of switching branch targets and rebasing prior to merging. Nate On 8/14/20 2:31 PM, Johan Ouwerkerk wrote: On Mon, Aug 3, 2020 at 11:50 P

Re: Git merge workflow: reverse it?

2020-08-14 Thread Johan Ouwerkerk
On Mon, Aug 3, 2020 at 11:50 PM Albert Astals Cid wrote: > > El dimecres, 29 de juliol de 2020, a les 14:01:07 CEST, Bhushan Shah va > escriure: > > At plasma, we are experimenting with new workflow regarding how bugfixes > > are put on the stable branch [1]. > > > > # Current workflow > > > > -