Re: Git merge workflow: reverse it?

2020-08-24 Thread Michael Reeves
"You keep track of your patches (more or less succesfully) and cherry-pick or port them." This sums up what I do with kdiff3. In fact right now trying to merge between stable and master or the other way around would be a nightmare project due to heavy refactoring. On Mon, Aug 24, 2020, 4:07 PM w

Re: Git merge workflow: reverse it?

2020-08-24 Thread boud
On 2020-08-24 21:55, Albert Astals Cid wrote: I disagree for it to per project, it has to be a global policy, otherwise contributing gets more complicated, since I have to remember for each project if they want bugfix patches to master or to stable. The current "global policy" isn't global alr

Re: Git merge workflow: reverse it?

2020-08-24 Thread Albert Astals Cid
El dilluns, 24 d’agost de 2020, a les 0:39:17 CEST, Elvis Angelaccio va escriure: > > On 29/07/20 14:01, Bhushan Shah wrote: > > Hello everyone! > Hi Bhushan > > > > At plasma, we are experimenting with new workflow regarding how bugfixes > > are put on the stable branch [1]. > > > > # Previous