On Tue, Dec 1, 2015 at 3:24 PM, Brett Cannon <br...@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. > Honestly I don't want to stand in the way of progress here. As long as there is a way to avoid the merge turds when doing the merge from the command line, I am okay with merge turds existing for merges done from the website. (A bigger question might be if merging a patch across three branches will become any easier. At this point I'm reluctant to accept small asyncio PRs because I have to merge then into 3.4, 3.5 and 3.6. But I expect that this would be a matter of git command line tricks regardless of the hosting platform.) > 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? > in the past we've had such arrangements, and IIRC typically over the years the hosting company has lost interest. We're better off being hosted on the default terms by a thriving company than by a company that's just scraping by offering us an incentive. Ignoring that, what might GitHub offer? -- --Guido van Rossum (python.org/~guido)
_______________________________________________ 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
