I am reading the CAVEATS of git-svn. via this SO question.
What I understand is that:
If you are mirroring svn trunk, branches etc on git repo, don\'t merge
You can merge git branches, that is the ones which aren't directly mirrored from SVN.
I would to have my own set of Git branches, made from the "git-svn" branches, and rebased regularly on top of said "git-svn" branches.
That way, I do all the merges I need locally in the Git repo, then I cherry-pick what I need in order to update the "git-svn" branches, that I can safely dcommit
without worrying about the first parent mentioned in the CAVEAT section of git-svn