Horrific SVN merge - is it possible to import repo to Git and use Git to merge?

As above, is it possible to export an SVN repo with history into a new Git repo and then use Git to do 开发者_Go百科a merge from a branch back into the trunk?

---

once you've merged, what then? Do you want to import the code back into SVN? You'll lose all the merge information.

you can migrate to git - there are answers already for that on SO, and you can use git-svn to put sort of a git front-end to a svn repo.