Local git push to remote repository on GitHub with conflicts
This video shows you what to do if you try to push a local repository up to the remote and there are conflicts. (With typos!)
Here's the error message you get when trying to push to a repo that's out of sync: Updates were rejected because the remote contains work that you do not have locally. This is usually caused by another repository pushing to the same ref. You may want to first integrate the remote changes
(e.g., 'git pull ...') before pushing again.