Resolving a merge conflict with git-svn

Hi,

I recently came across a big conflict. Someone used Subversion and made a complete wrong commit. I did a 'git svn rebase' at some point and ran into the conflict. My goal at this point was to remove the wrong commit, but I found no way how to do it (git-revert needs a clean tree; git stash brought [fatal: git-write-tree: error building trees,Cannot save the current state]). What way would suggest to remove that wrong made commit and continue with the rebase?

Thanks for any hints.