Mero's Blog
git
Cleanly merge git repositories
I describe how I did a clean, four-way merge of git repositories.