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

List:       perl5-porters
Subject:    Re: how to merge PRs
From:       Karen Etheridge <perl () froods ! org>
Date:       2022-05-07 23:10:39
Message-ID: CAPJsHfBJbWBK+bRD5x7701LYLaFyqi4iTBXWCyNdZGaZbGTmZQ () mail ! gmail ! com
[Download RAW message or body]

[Attachment #2 (multipart/alternative)]


"Update with rebase" would be it, yes. This is actually better as it gives
CI a chance to run before merging -- however, any conflicts would still
need to be resolved by a rebase on the command line (unless github has
progressed in that area too since I last looked).

On Sun, May 1, 2022 at 9:05 AM Sam Kington <sam@illuminated.co.uk> wrote:

> On 30 Apr 2022, at 21:02, Karen Etheridge <perl@froods.org> wrote:
>
>
> Unfortunately there isn't an option in github to either 1. refuse to merge
> unless the branch is rebased, or 2. perform a rebase itlself and merge
> while keeping the merge commit. (I hear gitlab allows for this.)
>
>
> I'm not an admin for out GitHub repository at $WORK, so I can't tell you
> exactly how this is set up, but there is such an option.
>
>
>
> Sam
> --
> Website: http://www.illuminated.co.uk/
>
>

[Attachment #5 (text/html)]

<div dir="ltr">&quot;Update with rebase&quot; would be it, yes. This is actually \
better as it gives CI a chance to run before merging -- however, any conflicts would \
still need to be resolved by a rebase on the command line (unless github has \
progressed in that area too since I last looked).<br></div><br><div \
class="gmail_quote"><div dir="ltr" class="gmail_attr">On Sun, May 1, 2022 at 9:05 AM \
Sam Kington &lt;<a href="mailto:sam@illuminated.co.uk">sam@illuminated.co.uk</a>&gt; \
wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px \
0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div \
style="overflow-wrap: break-word;">On 30 Apr 2022, at 21:02, Karen Etheridge &lt;<a \
href="mailto:perl@froods.org" target="_blank">perl@froods.org</a>&gt; \
wrote:<br><blockquote type="cite"><br>Unfortunately there isn&#39;t an option in \
github to either 1. refuse to merge unless the branch is rebased, or 2. perform a \
rebase itlself and merge while keeping  the merge commit. (I hear gitlab allows for \
this.)<br></blockquote><br>I'm not an admin for out GitHub repository at $WORK, so I \
can't tell you exactly how this is set up, but there is such an \
option.<div><br></div><div><img \
id="gmail-m_52174737304776464187A5B41CE-7A54-49B1-9F0E-3DA5D5B0218F" \
src="cid:180a0c7c03b11659fe21" width="640" height="180"><br><br><div>Sam<br>--  \
<br>Website: <a href="http://www.illuminated.co.uk/" \
target="_blank">http://www.illuminated.co.uk/</a><br></div><br></div></div></blockquote></div>


--00000000000053079e05de741685--


["Screenshot 2022-05-01 at 17.04.48.png" (image/png)]

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