Using git-svn: Pull, Merge or Rebase?

Question

I\'ve been fighting the git/git-svn learning curve and last night, as part of that learning curve, I did something very, very bad. I\'ve since gotten it corrected, but I\'m hopi

Answer 1

You should use git svn clone -s to clone complete svn tree, including all branches. From then on use git svn rebase and git svn dcommit in master to deal with svn, and you can create regular git branches for your private use.