Closed b-thorne closed 7 years ago
it looks like Github actually made and then undid all the commits, so the history is now very cluttered, you can restore the repo as it was before the first merge doing:
Make a backup
git checkout master
git checkout -b master_backup
then reset master to the state it was at https://github.com/bthorne93/PySM_public/commit/2561acac87bb4f7b4a05e606b68e6a20508b1060
git checkout master
git reset --hard 2561acac87bb4f7b4a05e606b68e6a20508b1060
then overwrite the history on master:
git push --force origin master
@zonca okay I have done this, thanks for the help.
Reverts bthorne93/PySM_public#11