Report question

Question: How to resolve a conflict with git-svn?