March 7, 2016
5:35 p.m.
On Tue, Mar 8, 2016 at 4:23 AM, Barry Warsaw <barry@python.org> wrote:
I think the essential bit of Nick's "easy way" is that you pretty much ignore your fork's master. It's just too much work to try to keep it sync'd against upstream master. Just do a pull of upstream master when you're starting something new, and push your branches to your own fork (and many people won't be able to push to upstream's repo anyway). Then use the web ui to create a pull request from that.
Yes, exactly. And you can tell git that (in .git/config or using the 'git config' command); effectively, if you "git checkout master; git pull", it'll pull in from upstream, not from origin (despite every other branch being tied to origin). Very handy. ChrisA