Have been using git for a couple of weeks and things were going swell. Until I was working on an outdated branch that couldn't be merged and then when I did everything broke.
I have since created a new branch 'new master' and made sure that this one includes all the changes, all the branches and is the current newest (working) version.
My aim now is to delete all the branches and make this 'new master' the new master branch.
How should I go about this without the chance of losing everything?
Also, if do this. On my local machine I should be doing git fetch -all? That should give me the new master and set me up to carry on as I was?