Merge stable to master vs cherry-picking

Harald Sitter sitter at kde.org
Mon Dec 6 06:07:50 GMT 2021


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 at 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


More information about the kde-devel mailing list