I seem to have gotten things quite messed up with my github repo. I work on two separate computers and what happened is that I made changes to a site on one computer without first getting the latest version that was on my github.
-After the changes were made I wasn’t able to commit these to the master branch without doing a pull from master.
-I did this and then commited the new changes only to find that it really messed up my code with a lot of duplicates, and random gibberish.
-I reverted to an old version of my code locally, but now I cannot push updates to the master because it thinks the master is ahead.
I get the error:
and have 1 and 2 different commits each, respectively. (use "git pull" to merge the remote branch into yours) nothing to commit, working tree clean``` Basically I need the local version on my computer to overwrite the master branch. How could I do this?