I find this way easier to merge branches and less conflicts:
Copy trunk to a new branch, merge it with feature branch/s. When things done, merge the n
use git svn:
git svn
git svn clone -s
then feel free to use git rebase command