I have a master project stored on my development machine. I push this to Github when changes are made.
But, I made 2 changes directly on Github as they were only modifications to the README and I was on a different computer.
My local is now different to the remote (the Github repo).
How do I get the local back in sync? The local was the main copy, but I think it's better to have the Github repo as the master.
You should run a
git pull origin master and merge with your local.
When done merging do
git push origin master to sync up the remote
If your local changes are too large you can use
git stash to hide them temporarily and pop them out of the stash.