[GHC DevOps Group] Welcome to GitLab!

[Matthew Pickering]

Does this mean that the commit message doesn't come from the MR description?

If I want to edit the commit message for a description I need to

1. squash the changes locally
2. force push the branch
3. Wait for CI to finish building (even though I just changed the
commit message).

Matt

On Thu, Dec 27, 2018 at 3:11 PM Ben Gamari <ben at well-typed.com> wrote:
>
> Matthew Pickering <matthewtpickering at gmail.com> writes:
>
> >> To ensure that GHC's git history remains linear ghc/ghc will use GitLab's
> >> "fast-forward without a merge commit" merge strategy.
> >
> > Are merge requests squashed before they are merged?
> >
> > It seems that the answer by default is no..
> > https://gitlab.com/gitlab-org/gitlab-ce/issues/27956
> >
> Indeed there are not. Moreover, in the workflow that I suggest in the
> email not squashing is the desired behavior since each commit is atomic.
>
> > and the reason being that upsteam prefers "Convention over
> > Configuration"..
> > https://about.gitlab.com/handbook/product/#convention-over-configuration
> >
> > However it seems that there is a per-mr option which can be checked if
> > you are diligent to do it for each MR. Some comments indicate that
> > it's possible to implement a webhook to change this behaviour.
> >
> I'm not sure there is a reasonable default here; not matter what you
> choose it will be wrong a good fraction of the time. The current plan is
> to just ensure that the person who merges an MR considers whether the
> history it introduces is useful and choose the correct option. I believe
> this should work fine although I'm happy to reconsider if not.
>
> Cheers,
>
> - Ben
>