Re: Git merge workflow: reverse it?

2022-05-10 Thread Michael Reeves
On Tue, May 10, 2022 at 10:48 AM Christoph Cullmann (cullmann.io) < christ...@cullmann.io> wrote: > On 2022-05-10 15:33, Nate Graham wrote: > > On 5/10/22 04:15, Ingo Klöcker wrote: > >>> https://manifesto.kde.org/commitments/ > >> > >> I don't see anything in there that would force the same

Re: Git merge workflow: reverse it?

2022-05-10 Thread Christoph Cullmann (cullmann.io)
On 2022-05-10 15:33, Nate Graham wrote: On 5/10/22 04:15, Ingo Klöcker wrote: https://manifesto.kde.org/commitments/ I don't see anything in there that would force the same merge workflow on all KDE projects. In my view the merge workflow is comparable to the coding style. Regards, Ingo

Re: Git merge workflow: reverse it?

2022-05-10 Thread Nate Graham
On 5/10/22 04:15, Ingo Klöcker wrote: https://manifesto.kde.org/commitments/ I don't see anything in there that would force the same merge workflow on all KDE projects. In my view the merge workflow is comparable to the coding style. Regards, Ingo I don't think anyone is trying to force

Re: Git merge workflow: reverse it?

2022-05-10 Thread Ingo Klöcker
On Dienstag, 10. Mai 2022 11:48:30 CEST Harald Sitter wrote: > On Tue, May 10, 2022 at 10:59 AM Ingo Klöcker wrote: > > On Dienstag, 10. Mai 2022 09:36:17 CEST Kai Uwe Broulik wrote: > > > can we get an update on this? > > > > > > Plasma is full on cherry-pick now but in KDE Gear it's

Re: Git merge workflow: reverse it?

2022-05-10 Thread Harald Sitter
I'm sure we can, it's one of the technical pillars of the manifesto :) https://manifesto.kde.org/commitments/ On Tue, May 10, 2022 at 10:59 AM Ingo Klöcker wrote: > > On Dienstag, 10. Mai 2022 09:36:17 CEST Kai Uwe Broulik wrote: > > can we get an update on this? > > > > Plasma is full on

Re: Git merge workflow: reverse it?

2022-05-10 Thread Ingo Klöcker
On Dienstag, 10. Mai 2022 09:36:17 CEST Kai Uwe Broulik wrote: > can we get an update on this? > > Plasma is full on cherry-pick now but in KDE Gear it's inconsistent and > frustrating when some projects use cherry-pick (e.g. Kate) and some > don't (e.g. Dolphin). > > I don't really mind what

Re: Git merge workflow: reverse it?

2022-05-10 Thread Kai Uwe Broulik
Hi, can we get an update on this? Plasma is full on cherry-pick now but in KDE Gear it's inconsistent and frustrating when some projects use cherry-pick (e.g. Kate) and some don't (e.g. Dolphin). I don't really mind what the outcome is but I need it to be consistent and predictable where