Fixing incorrect git-svn to git merge (I hope).