master | A -> B -> C -> D -> E -> F -> G \ H -> I | crazy-hack
The crazy-hack branch turned out to be just crazy enough to work. Normally I'd merge it into master and be happy. Unfortunately, somewhere between B and G something went horribly wrong. I'm worried if I merge, it'll end badly. I'd like to make my master branch point at I while keeping the old master branch somewhere. I'm not very experienced with git and this is important so if someone could have a look at the below I'd be grateful.
git checkout master git branch old-master-2013-07-30 git reset --hard abc123 (where abc123 id the githash for B)/> git merge crazy-hack git branch -d crazy-hack
The aim is to make things look like this:
old-master-2013-07-30 | A -> B -> C -> D -> E -> F -> G \ H -> I | master