[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-devel
Subject:    Re: Merge stable to master vs cherry-picking
From:       Harald Sitter <sitter () kde ! org>
Date:       2021-12-06 6:07:50
Message-ID: CAEc+18Fao2JmarSKeqtfaZJFFL5KY5yRQXGwbqAXQX8oZ+qb9A () mail ! gmail ! com
[Download RAW message or body]

I'm all for cherry picking. It's both easier and makes sure fixes are
actually available in master.

HS

On Fri, Dec 3, 2021 at 6:55 PM Kai Uwe Broulik <kde@privat.broulik.de> wrote:
>
> Hi everyone,
>
> as part of the GitLab transition in Plasma we changed our commit
> strategy from committing to stable and merging to master to committing
> to master and cherry-picking to stable. Reason being that it's a lot
> more convenient to do from GitLab's UI. I can merge and cherry-pick all
> from the web UI.
>
> However, other projects, such as most of KDE Gear, continues using
> merging, which makes the experience inconsistent and tedious. Fully
> retargeting a branch doesn't seem possible from the UI and not sure if
> you can merge up there either.
>
> What's keeping us from changing the strategy for the rest of KDE, too?
>
> Cheers
> Kai Uwe
[prev in list] [next in list] [prev in thread] [next in thread]