[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-devel
Subject:    Re: Proposal: make squash-merging the default behavior for gitlab MRs
From:       David Hurka <david.hurka () mailbox ! org>
Date:       2020-10-07 8:33:00
Message-ID: 2035422.OBFZWjSADL () doro
[Download RAW message or body]

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.

(https://invent.kde.org/graphics/okular/-/merge_requests/195#note_103948)

Is the mentioned infrastructure component newer than that? Then it probably 
works fine. :)


[prev in list] [next in list] [prev in thread] [next in thread]