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

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 branches off at commit B or C: