Terry J. Reedy <tjre...@udel.edu> added the comment:
PR 12579 started as a fixup for 3.7.4, but there seemed to be a problem of duplicate commits. The fix, based on Ned Deily's comments, after fetching from upstream: cd ../37 # 3.7 workspace git branch -D news37 # and dict37, whatever it was git reset --hard 784f52a^ <In response to 'more?', ' ' ENTER> git merge upstream/37 <Fix 3.7 NEWS.txt conflict - remove additions, and commit> git push --force origin Then git checkout -b news37 to add dates and fix for 3.7.4 to produce PR 13067 ---------- _______________________________________ Python tracker <rep...@bugs.python.org> <https://bugs.python.org/issue34162> _______________________________________ _______________________________________________ Python-bugs-list mailing list Unsubscribe: https://mail.python.org/mailman/options/python-bugs-list/archive%40mail-archive.com
