error: Entry '...' would be overwritten by merge. Cannot merge.

[anagalia]

I am trying to convert a reasonably large svn repository with branches and tags to git.

We have branches and tags with version numbers, e.g. 0.1, 0.2, ..., 0.10, 0.11, ..., 1.13, ..., 1.33 etc

Things are running for a long while, but then at some point however I am getting this error and not entirely sure how to fix this or continue:

Deleted remote branch svn/tags/last-local (was a6b0eb5).
Running command: git config --unset user.name
Running command: git config --unset user.email
Running command: git branch --track "0.10" "remotes/svn/0.10"
Branch 0.10 set up to track local ref refs/remotes/svn/0.10.
Running command: git checkout "0.10"
Switched to branch '0.10'
Running command: git branch --track "0.5" "remotes/svn/0.5"
Branch 0.5 set up to track local ref refs/remotes/svn/0.5.
Running command: git checkout "0.5"
warning: refname '0.5' is ambiguous.
Switched to branch '0.5'
Running command: git branch --track "0.6" "remotes/svn/0.6"
Branch 0.6 set up to track local ref refs/remotes/svn/0.6.
Running command: git checkout "0.6"
warning: refname '0.6' is ambiguous.
error: Entry 'GUID.py' would be overwritten by merge. Cannot merge.
command failed:
2>&1 git checkout "0.6"

Any suggestions??

[hemantthaiya]

Did anybody find a solution to this issue?