I can feel your pain. Right now I have this workflow: git add filename(s) git stash git svn rebase git svn dcommit git stash pop The worst is faile

I can feel your pain. Right now I have this workflow: git add filename(s) git stash git svn rebase git svn dcommit git stash pop The worst is failed merges in git svn rebase...