What's the difference between this and just using github? I think it's just the daemon-ness of dropbox. It would be cool to have something similar for arbitrary git repos that runs 'git fetch' periodically in the background. (or something fancier, if you want to scale it out) That keeps the conflict management at the git level, and you aren't keeping history of history anymore.