On Thu, Oct 06, 2016 at 07:43:21PM +0000, Brett Cannon <br...@snarky.ca> wrote:
> While we will use GitHub's Squash and Merge button for PRs, that doesn't
> meant everyone will want to use it; some people just prefer using a CLI.
> That means we need to come up with a set of instructions on how to take a
> GitHub PR and perform a squash commit manually at the CLI (committing a
> patch from bugs.python.org is simply since there's no squashing to do).
> Anyone have that set of commands handy?
It's something like::
$ git fetch github pull/$ID/head:$BRANCHNAME
$ git checkout master
$ git merge --squash $BRANCHNAME
$ git branch -d $BRANCHNAME
Oleg.
--
Oleg Broytman http://phdru.name/ p...@phdru.name
Programmers don't die, they just GOSUB without RETURN.
_______________________________________________
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
