Getting back to what I was trying to do before my GPG key expired, I cannot push
an update.  This is what I get:

----------[BEGIN TERMINAL SESSION]----------
ricky@localhost:~/Documents/POV-Ray/oc_devl/AndroidRobot> git push origin main
To github.com:CousinRicky/POV-AndroidRobot.git
 ! [rejected]        main -> main (non-fast-forward)
error: failed to push some refs to 'github.com:CousinRicky/POV-AndroidRobot.git'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. Check out this branch and integrate the remote changes
hint: (e.g. 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
ricky@localhost:~/Documents/POV-Ray/oc_devl/AndroidRobot> git pull origin main
From github.com:CousinRicky/POV-AndroidRobot
 * branch            main       -> FETCH_HEAD
Already up to date.
ricky@localhost:~/Documents/POV-Ray/oc_devl/AndroidRobot> git push origin main
To github.com:CousinRicky/POV-AndroidRobot.git
 ! [rejected]        main -> main (non-fast-forward)
error: failed to push some refs to 'github.com:CousinRicky/POV-AndroidRobot.git'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. Check out this branch and integrate the remote changes
hint: (e.g. 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
-----------[END TERMINAL SESSION]-----------

If a pull is saying it's up to date, why does a push say it's not?

I looked at the note about fast-forwards.  I saw words, I saw letters, but I
could not make it make any meaningful sense to me.

I might as well have been reading Sanskrit.

Help!

Post a reply to this message