MR does not merge
Simon Peyton Jones
simonpj at microsoft.com
Wed Jan 16 14:58:57 UTC 2019
But a key aspect of our workflow is:
* Make a patch, discuss review etc.
* Validate it locally
* Fire and forget (expect email if it fails to merge)
If not that, then how *can* I get a patch committed?
In parallel, might someone commit the MR below?
| -----Original Message-----
| From: Matthew Pickering <matthewtpickering at gmail.com>
| Sent: 16 January 2019 14:56
| To: Simon Peyton Jones <simonpj at microsoft.com>
| Cc: Ben Gamari <ben at well-typed.com>; ghc-devs at haskell.org
| Subject: Re: MR does not merge
| 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 <ghc-
| devs at haskell.org> wrote:
| > Ben
| > Six days ago I submitted this MR
| > https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitl
| > ab.haskell.org%2Fghc%2Fghc%2Fmerge_requests%2F109&data=02%7C01%7Cs
| > imonpj%40microsoft.com%7C63dabcb38771412f95b308d67bc2b2cc%7C72f988bf86
| > f141af91ab2d7cd011db47%7C1%7C0%7C636832473503704904&sdata=sJ2YvYGP
| > jRanq7nhP1IKhztYPjZA5z8629Lu2DoaFFU%3D&reserved=0
| > 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
| > ghc-devs at haskell.org
| > https://nam06.safelinks.protection.outlook.com/?url=http%3A%2F%2Fmail.
| > haskell.org%2Fcgi-bin%2Fmailman%2Flistinfo%2Fghc-devs&data=02%7C01
| > %7Csimonpj%40microsoft.com%7C63dabcb38771412f95b308d67bc2b2cc%7C72f988
| > bf86f141af91ab2d7cd011db47%7C1%7C0%7C636832473503704904&sdata=c1Yy
| > oHS2yBRMtJOOK8xqLcmbYiGj%2BBPVOn5xygSWkr8%3D&reserved=0
More information about the ghc-devs