Berker Peksag added the comment:

+The workflow of a developer might look something like this:

"a core developer" or "a contributor"? It would be good to split core developer 
and contributor workflows.

+    # address review comments and merge
+    git checkout master
+    git merge issueA
+    git branch -d issueA

For example, from the contributor side, you shouldn't touch the master branch 
at all.

It should be:

    # address review comments
    git commit -a
    # check upstream and rebase
    git pull --rebase upstream master  # or "origin master" in this example
    # push changes (optional)
    git push origin issueA  # origin should be contributor's fork here

----------
nosy: +berker.peksag
stage:  -> patch review
type:  -> enhancement

_______________________________________
Python tracker <rep...@bugs.python.org>
<http://bugs.python.org/issue22992>
_______________________________________
_______________________________________________
Python-bugs-list mailing list
Unsubscribe: 
https://mail.python.org/mailman/options/python-bugs-list/archive%40mail-archive.com

Reply via email to