[core-workflow] Questions about the proposed workflows

[Donald Stufft]

> On Dec 1, 2015, at 6:24 PM, Brett Cannon <brett at python.org> wrote:
> 
> It's Dec 1, which means it's time for any questions people have about the proposed workflows so we can get answers by Dec 15.
> 
> I have one question that applies to both proposals and one specific to GitLab. The general one is whether both Guido and me can both be happy. :) Guido doesn't want intermediate commits nor what he calls "merge turds" to show up in the history. I want to be able to do merges from the browser. Do either GitHub or GitLab provide a way through the web UI to give Guido what he wants, or will it always require having a checkout and SSH keys set up in order to do a PR merge? If only Guido can be made happy then that means either proposal becomes an easy way for people to get code hosting for their forks and a review tool but not a PR management platform since merges would occur outside the website and merges would simply be a `git push` which is basically what we do now to do the final merge for a patch.

As far as I am aware, when you merge with the browser in GitHub it essentially does ``git merge —no-ff`` which means there will *always* be a merge commit. There’s no support for a rebase workflow (where you rebase the branch ontop of master) or for squash merges or for FF merges.

> 
> The GitLab-specific question is what, if anything, is GitLab prepared to offer us? Both Nick and Barry have hinted that GitLab would host us, listen to our needs, etc., but it has always seemed to be speculation. Do we have concrete information as to what GitLab is willing to do for us?


-----------------
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/20151201/0ad98225/attachment.sig>