> On Dec 14, 2015, at 11:46 AM, Barry Warsaw <ba...@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
signature.asc
Description: Message signed with OpenPGP using GPGMail
_______________________________________________ core-workflow mailing list core-workflow@python.org https://mail.python.org/mailman/listinfo/core-workflow This list is governed by the PSF Code of Conduct: https://www.python.org/psf/codeofconduct
