Re: Marge bot integration

2022-01-24 Thread Vlad Zahorodnii
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

Re: Marge bot integration

2022-01-24 Thread Vlad Zahorodnii
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. Reg

Re: Marge bot integration

2022-01-24 Thread Ben Cooksley
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 “Merg

Re: Marge bot integration

2022-01-24 Thread Rohan Garg
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. > > M

Re: Marge bot integration

2022-01-21 Thread Ben Cooksley
On Sat, Jan 22, 2022 at 3:24 AM Nate Graham 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 > coul

Re: Marge bot integration

2022-01-21 Thread Nate Graham
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 correspo

Marge bot integration

2022-01-21 Thread Vlad Zahorodnii
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 kin