Re: Marge bot integration
Hi >> > I think that marge-bot would make merging patches in projects with high >> > traffic such as plasma a lot easier. Thoughts? > Mesa currently uses marge-bot extensively to merge contributions from developers. It definitely simplified a lot of the contribution workflow for developers. > > 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) > AFAIR each MR was handled one at a time. Having said that, Marge also has a batch mode that will batch together multiple MR's and will test and merge them together. This was recently enabled for Mesa, you can see this in action here [1]. I'm sure the Mesa developers will be happy to share their experience with Marge on mesa-...@lists.freedesktop.org Cheers Rohan Garg [1] https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14457
Re: Marge bot integration
On Mon, Jan 24, 2022 at 10:48 AM David Hurka wrote: > > 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. > > This is very similar to the “Merge Train” feature in GitLab Enterprise, > right? > Correct, although it has more functionality in some areas from my understanding of it. Cheers, Ben
Re: Marge bot integration
On 1/24/22 13:02, Ben Cooksley wrote: This is very similar to the “Merge Train” feature in GitLab Enterprise, right? Correct, although it has more functionality in some areas from my understanding of it. Yeah, after quickly reading gitlab docs, it looks exactly what we look for. Regards, Vlad
Re: Marge bot integration
On 1/24/22 12:14, Rohan Garg wrote: Mesa currently uses marge-bot extensively to merge contributions from developers. It definitely simplified a lot of the contribution workflow for developers. Yeah, I discovered marge-bot thanks to Mesa. :-) Cheers, Vlad
