[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 8:37:13
Message-ID: CA+XidOHU=Sct6qj5FZEmg501M+2+DQ0KvwfeR3u1pZuU+DjdEQ () mail ! gmail ! com
[Download RAW message or body]

On Wed, Oct 7, 2020 at 9:33 PM David Hurka <david.hurka@mailbox.org> wrote:

> 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. :)
>


>

I've taken a look and it appears that the review in question does have the
"Allow Collaboration" box ticked, so you should have been able to rebase it.
Unfortunately it has since been closed, so we can't investigate any further
unfortunately...

Cheers,
Ben

[Attachment #3 (text/html)]

<div dir="ltr"><div dir="ltr">On Wed, Oct 7, 2020 at 9:33 PM 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 Wednesday, October 7, 2020 9:52:41 AM CEST Ben \
Cooksley wrote:<br> &gt; &gt; Isn't it true that "Allow contributions" must be \
checked before the<br> &gt; &gt; "Squash<br>
&gt; &gt; commits" checkbox is available? (I already wrote that, but I feel \
people<br> &gt; &gt; don't<br>
&gt; &gt; care, so I make it a question now.)<br>
&gt; <br>
&gt; The allow contributions box should always be ticked - we have<br>
&gt; infrastructure components that automatically change this in the background<br>
&gt; whenever a merge request is created.<br>
<br>
Oh, nice! This is from a MR from June 2020, which couldn't be rebased:<br>
<br>
&gt; You need to force push since you&#39;re rewriting history.<br>
&gt; <br>
&gt; If that doesn&#39;t work it means the branch author manually unchecked<br>
&gt; the checkbox that enables collaboration and indeed there&#39;s not much<br>
&gt; we can do other than creating a new branch/MR somewhere else.<br>
<br>
(<a href="https://invent.kde.org/graphics/okular/-/merge_requests/195#note_103948" \
rel="noreferrer" target="_blank">https://invent.kde.org/graphics/okular/-/merge_requests/195#note_103948</a>)<br>
 <br>
Is the mentioned infrastructure component newer than that? Then it probably <br>
works fine. :)<br>    </blockquote><blockquote class="gmail_quote" style="margin:0px \
0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">  \
<br></blockquote><div><br></div><div>I&#39;ve taken a look and it appears that the \
review in question does have the &quot;Allow Collaboration&quot; box ticked, so you \
should have been able to rebase it.</div><div>Unfortunately it has since been closed, \
so we can&#39;t investigate any further \
unfortunately...</div><div><br></div><div>Cheers,</div><div>Ben  </div></div></div>



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