I was playing around with some code and after having got it working I thought I’d make just one more little quick easy change to finish it off and found that I was descending a spiral of additional complexity due to the environment in which it had to work. As this was going to be “easy” I’d been pushing the commits to master on Github (I’m the only one using this code) and of course a few reworks in I’d realised that this was never going to work out well and needed to be abandoned.
So, how to fix this? The ideal situation would be to just disappear all the commits after the last good one, but that’s not really an option, so what I wanted was to create a branch from the last good point and then swap master and that branch over. Googling pointed me to some possibilities, including this “deprecated feedback” item from “githubtraining” which was a useful guide so I thought I should blog what worked for me in case it helps others.
git checkout -b good $LAST_GOOD_COMMIT # This creates a new branch from the last good commit
git branch -m master development # This renames the "master" branch to "development"
git branch -m good master # This renames the "good" branch to "master".
git push origin development # This pushes the "development" branch to Github
- In the Github web interface I went to my repos “Settings” on the right hand side (just above the “clone URL” part) and changed the default branch to “
git push origin :master # This deletes the "master" branch on Github
git push --all # This pushes our new master branch (and everything else) to Github
- In the Github web interface I went and changed my default branch back to “
…and that was it, not too bad!
You probably don’t want to do this if anyone else is using this repo though. 😉