Your main branch in GitHub has some commits they are not in python/cpython. https://github.com/smontanaro/cpython/commits/main
If you don't mind to trash all changes in your local and Github main branch, you can sync main branches by: # delete all changes in your worktree and main branch. $ git reset --hard upstream/main # delete all changes in your Github main branch. $ git push --force origin main On Thu, May 6, 2021 at 9:41 PM Skip Montanaro <skip.montan...@gmail.com> wrote: > > (Sorry, this is probably not really python-dev material, but I'm stuck > trying to bring my fork into sync with python/cpython.) > > I don't know if I did something to my fork or if the master->main > change did something to me, but I am unable to sync my > smontanaro/cpython main with the python/cpython main. The dev guide > gives this simple recipe: > > git checkout main > git pull upstream main > git push origin main > > Here's how that goes: > > (python39) rvm% git co main > Already on 'main' > Your branch is up to date with 'upstream/main'. > (python39) rvm% git pull upstream main > From git://github.com/python/cpython > * branch main -> FETCH_HEAD > Already up to date. > (python39) rvm% git push origin main > To github.com:smontanaro/cpython.git > ! [rejected] main -> main (non-fast-forward) > error: failed to push some refs to 'github.com:smontanaro/cpython.git' > hint: Updates were rejected because the tip of your current branch is behind > hint: its remote counterpart. Integrate the remote changes (e.g. > hint: 'git pull ...') before pushing again. > hint: See the 'Note about fast-forwards' in 'git push --help' for details. > > I looked at the fast-forward stuff in 'git push --help' but couldn't > decipher what it told me, or more importantly, how it related to my > problem. It's not clear to me how python/cpython:main can be behind > smontanaro/cpython:main. I've attached my .git/config file in case > that provides clues to the Git aficionados. > > Thx... > > Skip > _______________________________________________ > 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/J6GGEKUBMPU3X3WNKUG2XUD3GDV7L2FK/ > Code of Conduct: http://python.org/psf/codeofconduct/ -- Inada Naoki <songofaca...@gmail.com> _______________________________________________ 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/EWSK2TM4QD3BM5G2CMEIJB6PVFO3FNSO/ Code of Conduct: http://python.org/psf/codeofconduct/
