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

Just delete every file in <Repo>/.git/ which ends in (... conflictedcopy <date>).

That will clean your git repo; the answer by Frank R. does in fact the same, while keeping the other by Dropbox abused files :)

Answer 2

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"..

Answer 3

A quick way to apply the solutions from kenansulayman and Frank R. is with the following command, that should be ran from the root of the defective repository:

find .git -name '*conflicted*' -exec rm {} \;

Notice: I assume you don't have any branches, tags (or some other git object) with the string conflicted in their names. If you do, that command will also delete those wanted files.

That worked for me. Cheers.