From: Jens Kubieziel <kubieziel@googlemail.com>
Date: Sat, 14 Nov 2009 00:30:57 GMT
Subject: Resolving a merge conflict with git-svn
Message-ID: <76ee5f990911131630k41a91f70n5e717befb7693463@mail.gmail.com>

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.