I had the same problem and the only solution that I found was to navigate to the head like so:
.git/refs/heads/branch_name
And I deleted the head file. Then I went to the console and I used the command:
git reset
Then all the files were unstaged so add them and commit them afterwards.