Proposal: make squash-merging the default behavior for gitlab MRs
david.hurka at mailbox.org
Wed Oct 7 09:33:00 BST 2020
On Wednesday, October 7, 2020 9:52:41 AM CEST Ben Cooksley wrote:
> > 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.
Oh, nice! This is from a MR from June 2020, which couldn’t be rebased:
> You need to force push since you're rewriting history.
> If that doesn't work it means the branch author manually unchecked
> the checkbox that enables collaboration and indeed there's not much
> we can do other than creating a new branch/MR somewhere else.
Is the mentioned infrastructure component newer than that? Then it probably
works fine. :)
More information about the kde-devel