Whenever something awfully fails with GitHub pulling (read: When you use Github), I have the horrible habit of manually copying the code I want to be saved, and starting over in a new local repo. After a while, I found out I have around 9 local repositories of the same remote repo stored in one folder, too lazy to clean it all up.