warning: refname 'xxx' is ambiguous when using git-svn

Question

I am using git as a frontend to Subversion (via git svn).

So, for every svn trunk/branch I have remote branch in git named \"remotes/xxx\". For example \"remotes/tru

Answer 1

To avoid the conflict messages, when referring to local branches, prefix them with heads/

for example, the conflicting branch topic

$ git diff topic remotes/topic
warning: reframe 'topic' is ambiguous.
...

becomes

$ git diff heads/topic remotes/topic
...