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

I was able to delete all the conflicted files from my .git folder, but I continued to get errors about files that no longer existed.

The fix for me was opening up .git/refs/packed_refs and deleting lines that contained the text "conflicted".