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?

They are almost identical sites.. just two teams working on different stuff. @Ryan and Charles I wish I knew the answer to that other question. I think we are moving to git but right now it is still up in the air. I basically just need to get this one merge together and then will just continue with the assumption we are using git.
–
ZacApr 24 '12 at 23:09

You will get a warning that there's no base commit, so you'll have two orphan branches

Now you can merge branches. This should be terrible, awful, since they are related but completely different history, but then you have no other option. Rebase would be nonsense here since commits are unrelated.