Git fatal: Reference has invalid format: 'refs/heads/master

Question

I am using Dropbox to sync a git repository, but now when I try and push I am getting an error:

fatal: Reference has inval         


        

Answer 1

The conflicted file could be in multiple places, I would look into:

.git/logs/refs/remotes/origin/
.git/logs/refs/heads/
.git/refs/remotes/origin/
.git/refs/heads/

Or you might look everywhere in the .git subdirectory: find . -name '*conflicted*'

Or, otherwise, list the active branches with git branch -a and delete (git branch -d) anything suspicious.