> Should be easy to merge :) Famous last words. Seriously, though, we should have learnt at this point: we cannot solve social issues with technology. Everybo

> Should be easy to merge :) Famous last words. Seriously, though, we should have learnt at this point: we cannot solve social issues with technology. Everybody is working on a different tree, and social dynamics that govern the spread of idioms and from which fork you cherry-pick or merge is much more complex than what git is designed to handle.