Git conflicted copy error while cloning a repository

Question

I am using dropbox as a git repository.

Now due to some issue in the syncing, there is some conflicted copy present in the git. How do I remove this conflict ? Due to

Answer 1

The solution that eventually worked for me was to simply delete the branch that the reference refers to, e.g.

git branch -D "debugging (xyz conflictedcopy date)"

I had many such references, so it was "rinse and repeat"..