Marge bot integration

[Ben Cooksley]

On Sat, Jan 22, 2022 at 3:24 AM Nate Graham <nate at kde.org> wrote:

> We have this issue all over Plasma. I think adopting a bot to do it
> would be a great idea.
>
> It seems like this could also be used to automatically cherry-pick
> commits. Perhaps if the merge request has `cherry-pick` in its tags, it
> could automatically cherry-pick the commits to a branch corresponding to
> the milestone. That would get rid of another annoying manual chore.
>
> Nate
>
>
> On 1/21/22 05:42, Vlad Zahorodnii wrote:
> > Hi,
> >
> > In kwin, we experience merge congestion issues where pending merge is
> > aborted because another merge request has been merged in meanwhile, so
> > you need to go back to the MR, rebase it and schedule a merge again.
> > This is exhausting and frustrating developer experience.
> >
> > Fortunately, this kind of issues can be solved by using
> > https://github.com/smarkets/marge-bot. With marge bot, when all review
> > comments have been addressed, you need to assign the MR to the marge-bot
> > user. After that, it will try to merge the patch and if needed rebase
> > and retry again. marge-bot is used by projects such as Mesa, pulse
> > audio, various GNOME projects, etc.
> >
> > I think that marge-bot would make merging patches in projects with high
> > traffic such as plasma a lot easier. Thoughts?
>

My first question would be concerning scalability - is marge-bot
intelligent enough to not try to rebase/merge multiple MRs in the same
repository at the same time?
(It looks like it might be but it doesn't say so explicitly)


> >
> > Regards,
> > Vlad
>

Cheers,
Ben
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-devel/attachments/20220122/98269deb/attachment.htm>