github - git error when uploading local project to remote warehouse

Question

Updating remotely still doesn’t work

Answer 1

If the remote master is updated, execute git pull origin master first

Answer 2

The code base is out of sync, and the version you commit takes precedence.
git pull origin master
git status to check if there are any conflicts, resolve the conflicts and then push