Git merge workflow: reverse it?

Ingo Klöcker kloecker at kde.org
Tue May 10 11:15:19 BST 2022


On Dienstag, 10. Mai 2022 11:48:30 CEST Harald Sitter wrote:
> On Tue, May 10, 2022 at 10:59 AM Ingo Klöcker <kloecker at kde.org> 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 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 to target my MRs, at least for every domain
> > > (Plasma, Gear, ..).
> > 
> > I can imagine a consistent rule for Frameworks (if that's what you mean by
> > "domain"). Apart from that I can only imagine a consistent rule per
> > development team, e.g. Plasma team or PIM team, but not for Gear as a
> > whole
> > which is just a random mix of the products of different teams with
> > different workflows. Of course, this doesn't stop the different
> > development teams from adopting the same merge workflow. But this cannot
> > be forced on all development teams.
> 
> I'm sure we can, it's one of the technical pillars of the manifesto :)

I wish top-posting was forbidden by the manifesto. ;-)

> 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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: This is a digitally signed message part.
URL: <http://mail.kde.org/pipermail/kde-core-devel/attachments/20220510/24371e0e/attachment.sig>


More information about the kde-core-devel mailing list