> On 4 May 2021, at 01:45, Tim Peters <tim.pet...@gmail.com> wrote: > > Right? Wrong? Do we need some mix of both? Something else?
Having renamed the branch in my fork first, the exact sequence I used on my own clone was: ❯ git checkout master ❯ git branch -m master main ❯ git fetch origin ❯ git branch -u origin/main main ❯ git remote set-head origin -a ❯ git fetch upstream ❯ git remote set-head upstream -a ❯ git pull upstream main This worked, I can successfully pull from upstream's main and push to my upstream's main. The `set-head` ones were suggested by the GitHub UI and ended up with heads explicitly being listed in `git log` which I guess is harmless. Cheers, Łukasz _______________________________________________ Python-Dev mailing list -- python-dev@python.org To unsubscribe send an email to python-dev-le...@python.org https://mail.python.org/mailman3/lists/python-dev.python.org/ Message archived at https://mail.python.org/archives/list/python-dev@python.org/message/HRLKK4QXASEAVJPPUPJMI53CJRCWIHPV/ Code of Conduct: http://python.org/psf/codeofconduct/