[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:       Ben Cooksley <bcooksley () kde ! org>
Date:       2020-10-07 7:52:41
Message-ID: CA+XidOH9oZDdjzUgsmyR3SMGFhj4fG0jQdbtyknx0gNz4c+yLw () mail ! gmail ! com
[Download RAW message or body]

On Wed, Oct 7, 2020 at 8:08 AM David Hurka <david.hurka@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

[Attachment #3 (text/html)]

<div dir="ltr"><div dir="ltr">On Wed, Oct 7, 2020 at 8:08 AM David Hurka &lt;<a \
href="mailto:david.hurka@mailbox.org">david.hurka@mailbox.org</a>&gt; \
wrote:<br></div><div class="gmail_quote"><blockquote class="gmail_quote" \
style="margin:0px 0px 0px 0.8ex;border-left:1px solid \
rgb(204,204,204);padding-left:1ex">On Tuesday, October 6, 2020 4:26:02 PM CEST Nate \
Graham wrote:<br> &gt; Taking stock of the responses so far, it doesn&#39;t seem like \
there&#39;s much<br> &gt; enthusiasm for the original proposal. That&#39;s fine, and \
I can understand<br> &gt; the desire to push people to improve their git skills.<br>
<br>
Yes, I interpret this thread the same.<br>
<br>
&gt; It seems like<br>
&gt; there is some agreement on an alternative, which various people have<br>
&gt; proposed:<br>
&gt; <br>
&gt; GitLab already *kind of* offers this, in the form of the &quot;Squash<br>
&gt; commits&quot; checkbox next to the merge button.<br>
<br>
Isn't it true that "Allow contributions" must be checked before the "Squash <br>
commits" checkbox is available? (I already wrote that, but I feel people don't <br>
care, so I make it a question now.)<br></blockquote><div><br></div><div>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.</div><div><br></div><div>Cheers,</div><div>Ben  </div></div></div>



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