On 11/2/2017 4:54 AM, Lele Gaifax wrote:
I'm not sure if the rebase should have been done on the original branch
instead of creating a new one, or instead if I should open a new PR (and close
the original one?).
It is normal to 'git merge upstream/master' after updating the master
branch and checking out the pr branch, and then push the updated branch.
I sometimes have to do that when reviewing a pr. Often, for me, the
problem is not merge conflicts, but re version conflicts. However, if
there are merge conflicts that make it easier to reproduce the patch
from the current master, closing and opening a new PR is ok too.
--
Terry Jan Reedy
_______________________________________________
Python-Dev mailing list
[email protected]
https://mail.python.org/mailman/listinfo/python-dev
Unsubscribe:
https://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com