Undo last commit/merge

Undo last commit/merge

I have messed up my git repo a little. I worked on a feature in a separate branch. After finishing the work, I switched to the master to merge it into, but … Read more