I'm using git, and made a small commit followed by a large one. I decided to use git rebase
to squash the two commits together before pushing them. (I've never done this before.)
So I did:
git rebase -i HEAD~2
This gave me my editor, where I chose to pick the earlier commit and squash the later one. When I saved, git said:
error: cannot stat 'filename': Permission denied
Could not apply sha1 for later commit... initial line of text for that commit
Now:
git log
.git status
tells me I'm "Not currently on any branch."What happened!? How do I fix it?
Try closing any programs that have the folder open, such as editors, explorer windows, command prompts, and FTP programs. This always fixes the issue for me on Windows.