Using git-svn to merge a svn branch back into trunk and trunk back into the branch

Question

So I\'m using git and interacting with an svn repo.

I have a svn TRUNK that looks like this:

A-B-C-D

And a svn bug_fixes branch that br

Answer 1

Would this not be a good case for rebasing your local stuff (..i) onto the new master fetched from SVN?