[core-workflow] Questions about the proposed workflows

[Donald Stufft]

> On Dec 14, 2015, at 11:46 AM, Barry Warsaw <barry at python.org> wrote:
> 
> On Dec 14, 2015, at 11:35 AM, Donald Stufft wrote:
> 
>> You don’t really need the merge commit if you’re doing squash merges
> 
> Just to be clear though, with a GitHub choice, you'd either have to accept
> merge commits, or do the squash merges locally and then push master because
> they aren't supported by GH's u/i, right?
> 

Correct. Where “locally” could also include a robot to do merges based on a comment left on the PR, like “Ok to Merge”. There is no built in option to do anything but ``git merge —no-ff`` in Github’s UI.


-----------------
Donald Stufft
PGP: 0x6E3CBCE93372DCFA // 7C6B 7C5D 5E2B 6356 A926 F04F 6E3C BCE9 3372 DCFA

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 842 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://mail.python.org/pipermail/core-workflow/attachments/20151214/cc5ecd50/attachment.sig>