On 6 Mar 2016 12:27, "Nick Coghlan" <ncogh...@gmail.com> wrote: > > Something that came up at work recently was instructing people on how best to configure local git clones for working with a "fork+PR" development model, where you have your own server-side fork for the project that you then use to submit pull requests. The trick is that there's an easy way to do this and a hard way, and it isn't immediately obvious which is which :) > > The easy way: >
Oops, I left out the first step here: * create a personal fork of the upstream repo on GitHub > * clone the upstream repo read-only > * add your fork as an additional read/write remote: > * e.g. "git remote add pr <URL of fork>" > * work in a branch > * e.g. "git checkout master && git checkout -b issueNNNN-summary-of-issue" > * publish via your fork, and then submit back to the main repo > * "git push pr" > * use the web UI to submit the PR The first step needs to be done once per project, and steps 2 & 3 once per project per client device. The actual patch development process is then a matter of ensuring your clone is up to date, creating a working branch, making & committing the changes, pushing to your personal fork, and then submitting the PR. Regards, Nick.
_______________________________________________ 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
