http://stackoverflow.com/questions/15862922/fix-git-not-currently-on-any-branch-after-merge-conflicts
Not sure what happened, but you could fix it easily by creating a new branch and then merging it:git branch lost_changesgit checkout mastergit merge lost_changes
git branch lost_changes
git checkout master
git merge lost_changes