We have two git repositories “AlphaBeta_iOS” and “AlphaBeta_Android” that we would like to merge them into one new repository “AlphaBeta”.
Each existing repository should get its own sub folder named “iOS” and “Android”.
The history of both repositories should be preserved.
A very easy way to convert a Mercurial repository to Git is by using the fast-export script:
cd ~ git clone git://repo.or.cz/fast-export.git git init git_repo cd git_repo git config core.ignoreCase false ~/fast-export/hg-fast-export.sh -r /path/to/old/mercurial_repo git checkout HEAD
If you have some special requirements you might want to have a look at the comments in this StackOverflow answer: