So after I mucked about with source tree and checked out a old version and changed some stuff I decided to merge it back to the master branch… that was a bad move. I should have saved the change I made and checked out the head version and then integrated the change. Anyway this is what it looked like:
As you can see not a lot to work with. I spent a day trying to undo the merge. And it didn’t seem like it was going to happen.
Cried for a bit the then carried on and make this, bigger and better:
