Month: November 2011

The Coolest Merge EVER – My take

Linus Torvalds wrote about “The coolest merge EVER!” back in June 20051 now I needed to do something similar a while back.

I had two git repositories that I use for database backup, the two repositories contains backup from a different mysql server in a master-slave setup and therefor contains mostly the same data. This… Read more »