Proposal: make squash-merging the default behavior for gitlab MRs

[Ben Cooksley]

On Wed, Oct 7, 2020 at 8:08 AM David Hurka <david.hurka at mailbox.org> wrote:

> On Tuesday, October 6, 2020 4:26:02 PM CEST Nate Graham wrote:
> > Taking stock of the responses so far, it doesn't seem like there's much
> > enthusiasm for the original proposal. That's fine, and I can understand
> > the desire to push people to improve their git skills.
>
> Yes, I interpret this thread the same.
>
> > It seems like
> > there is some agreement on an alternative, which various people have
> > proposed:
> >
> > GitLab already *kind of* offers this, in the form of the "Squash
> > commits" checkbox next to the merge button.
>
> Isn’t it true that “Allow contributions” must be checked before the
> “Squash
> commits” checkbox is available? (I already wrote that, but I feel people
> don’t
> care, so I make it a question now.)
>

The allow contributions box should always be ticked - we have
infrastructure components that automatically change this in the background
whenever a merge request is created.

Cheers,
Ben
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-devel/attachments/20201007/43b01a94/attachment.htm>