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

What you also can do is cherry-pick, provided that you wouldn't use merge.

Both statements should be done on the branch without the changes.

Provided that c is older than i and that you want to take the whole sequence.

git cherry-pick c..i

Or separate commits

git cherry-pick c d e f g h i