[core-workflow] Spelling out a suggested local workflow for sending PRs?

[Nick Coghlan]

On 8 Mar 2016 03:23, "Barry Warsaw" <barry at python.org> wrote:
> On Mar 06, 2016, at 12:27 PM, Nick Coghlan 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.

Exactly, although it's actually "Vit's easy way" (my colleague Vit Ondruch
proposed this as the recommended GitLab workflow for our current project at
work, and it finally clicked for me what I'd been doing wrong all this
time).

That said, Chris's variant of just setting the upstream of the local
clone's master branch to the upstream repo so "git checkout master && git
pull" on master reads directly from upstream, while "git push" defaults to
going to your fork, does sound intriguing - I'm going to try that on some
of my existing projects where I made the original clone from my personal
fork.

Cheers,
Nick.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.python.org/pipermail/core-workflow/attachments/20160308/af855912/attachment.html>