Re: [python-committers] Wanting to merge my first PR under github - a bit of advice
On 21 March 2018 at 14:02, Mariatta Wijaya wrote: > Some steps were written here: > https://devguide.python.org/gitbootcamp/#accepting-and-merging-a-pull-request > > And the section right after explains the backport. Thanks Mariatta - that's exactly what I was looking for. > I guess it needs reorganizing. It's depressing how often the problem is not about providing the information, but about helping people find it. I was *almost* there - I remember skimming the pages about git, but as I know git itself, I was assuming it was about git for people who didn't know it, rather than "how the CPython workflow uses git" and missed that bit. I'll see if I can think of a way of making it a bit more obvious. > Top posted from my phone while literally on a beach. I'm jealous :-) Paul ___ python-committers mailing list python-committers@python.org https://mail.python.org/mailman/listinfo/python-committers Code of Conduct: https://www.python.org/psf/codeofconduct/
Re: [python-committers] Wanting to merge my first PR under github - a bit of advice
Some steps were written here: https://devguide.python.org/gitbootcamp/#accepting-and-merging-a-pull-request And the section right after explains the backport. I guess it needs reorganizing. Top posted from my phone while literally on a beach. On Wed, Mar 21, 2018, 7:57 AM Paul Moore wrote: > On 21 March 2018 at 12:42, Nick Coghlan wrote: > > On 21 March 2018 at 06:58, Paul Moore wrote: > >> > >> Hi, > >> Cheryl Sabella kindly migrated a patch I'd put on bpo some time ago > >> but forgotten about onto github. The PR (#6158) is ready to go (I > >> think) but this is the first time since the migration to github that > >> I've done a merge, and I'm not quite sure what the workflow is :-( I > >> didn't see much in the devguide (which covers how to write a PR, how > >> to test it etc, but not so much how to merge it, unless I missed > >> something, or it's so simple that the little I did find is all that's > >> needed!) > > > > > > You didn't miss it - https://devguide.python.org/committing/ is still > pretty > > much written for the old approach of merging on the command line. > > > > So a devguide issue would definltely be appropriate, and if you're so > > inclined, even a PR with the docs that you wish had existing when you > looked > > for them :) > > I'll certainly try to find some time to put something together. For > now, I've raised https://github.com/python/devguide/issues/347 to > track it. > > Paul > ___ > python-committers mailing list > python-committers@python.org > https://mail.python.org/mailman/listinfo/python-committers > Code of Conduct: https://www.python.org/psf/codeofconduct/ > ___ python-committers mailing list python-committers@python.org https://mail.python.org/mailman/listinfo/python-committers Code of Conduct: https://www.python.org/psf/codeofconduct/
Re: [python-committers] Wanting to merge my first PR under github - a bit of advice
On 21 March 2018 at 12:42, Nick Coghlan wrote: > On 21 March 2018 at 06:58, Paul Moore wrote: >> >> Hi, >> Cheryl Sabella kindly migrated a patch I'd put on bpo some time ago >> but forgotten about onto github. The PR (#6158) is ready to go (I >> think) but this is the first time since the migration to github that >> I've done a merge, and I'm not quite sure what the workflow is :-( I >> didn't see much in the devguide (which covers how to write a PR, how >> to test it etc, but not so much how to merge it, unless I missed >> something, or it's so simple that the little I did find is all that's >> needed!) > > > You didn't miss it - https://devguide.python.org/committing/ is still pretty > much written for the old approach of merging on the command line. > > So a devguide issue would definltely be appropriate, and if you're so > inclined, even a PR with the docs that you wish had existing when you looked > for them :) I'll certainly try to find some time to put something together. For now, I've raised https://github.com/python/devguide/issues/347 to track it. Paul ___ python-committers mailing list python-committers@python.org https://mail.python.org/mailman/listinfo/python-committers Code of Conduct: https://www.python.org/psf/codeofconduct/
Re: [python-committers] Wanting to merge my first PR under github - a bit of advice
On 21 March 2018 at 06:58, Paul Moore wrote: > Hi, > Cheryl Sabella kindly migrated a patch I'd put on bpo some time ago > but forgotten about onto github. The PR (#6158) is ready to go (I > think) but this is the first time since the migration to github that > I've done a merge, and I'm not quite sure what the workflow is :-( I > didn't see much in the devguide (which covers how to write a PR, how > to test it etc, but not so much how to merge it, unless I missed > something, or it's so simple that the little I did find is all that's > needed!) > You didn't miss it - https://devguide.python.org/committing/ is still pretty much written for the old approach of merging on the command line. So a devguide issue would definltely be appropriate, and if you're so inclined, even a PR with the docs that you wish had existing when you looked for them :) Cheers, Nick. -- Nick Coghlan | ncogh...@gmail.com | Brisbane, Australia ___ python-committers mailing list python-committers@python.org https://mail.python.org/mailman/listinfo/python-committers Code of Conduct: https://www.python.org/psf/codeofconduct/