Merge svn repo with git repo

Question

I have the daunting task of merging a site with a ton of files between two teams. One team has been working on git and one using svn. Can I please get some help with the best way to go about this? What I am thinking is I will create a new bare repo

git clone --bare ~/dir gitversion.git

Then create a branch from there

git checkout -b import-svn

Then on that branch I will pull from svn

svn checkout svn://svnversion/trunk

Now on this branch I would rebase?

git rebase origin/master

Then switch back to master branch

git merge import-svn

I tried something like this but seemed to be getting nowhere. Never got any merge conflicts or anything which doesnt make sense. Can someone please show me a decent workflow to accomplish this?

Answer 1

There is a recent article on the topic by Microsoft including a walk through using the git-svn utility. They provide information on merging with and without svn change history.