On 13/09/18 01:59, Miller Puckette wrote:
I think of git as a kitchen blender, very powerful when used correctly, but if you've ever started one without remembering to put the top on you will also learn of its power to spread mayhem.
Lol very apt!
A particularly handy command when you get stuck is the `git reset` family. If everything gets hosed you can return your branch to some previous (or future) point in history by going `git reset --hard REVNO` where REVNO is the hash of the commit you want to reset everything to. This will delete any modifications you've made in local, so often it's wise to do a `git stash` first if you have local modifications.
Cheers,
Chris.