I wonder if gitlab could have a feature like what bors offers. Validate and merge or [rebase and validate and merge]+. Thus eventually merging it or rejecting it due to conflict or validation failure.
Sent from my iPhone > On 16 Jan 2019, at 10:55 PM, Matthew Pickering <[email protected]> > wrote: > > There is problem with the interaction between "merge when validated" > and "fast forward merge only" option. > > If anyone commits to master between clicking the button and validation > finishing then the merge will fail as the patch needs to be rebased > before it can be merged. > > I'm not sure what the plan to deal with this is. > > On Wed, Jan 16, 2019 at 2:49 PM Simon Peyton Jones via ghc-devs > <[email protected]> wrote: >> >> Ben >> >> Six days ago I submitted this MR >> >> https://gitlab.haskell.org/ghc/ghc/merge_requests/109 >> >> Just tiny refactorings. I said “merge when validated” >> >> But six days later, it still appears not to have merged. What’s up? I was >> expecting it to merge in a matter of an hour or two. >> >> Thanks >> >> Simon >> >> _______________________________________________ >> ghc-devs mailing list >> [email protected] >> http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs > _______________________________________________ > ghc-devs mailing list > [email protected] > http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs _______________________________________________ ghc-devs mailing list [email protected] http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs
