On: Git is cheap

[groby_b]

You can always use git-svn for local sanity :)

[zwieback → groby_b]

In theory yes, in reality git-svn is driving me insane. I can't wait to move to an all-git solution. Not because I love git but because I can then stop bridging two worlds with git-svn.

You can make git-svn work for non-trivial setups but it took me a lot of trial and error, failed merges and git stashes to make it work for me.

[Shorel → zwieback]

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...