C9's git implementation leaves something to be desired when it comes to merges.