[pmeunier]

I'd say maybe check it out first, especially the parts about patch commutation and the problems with associativity in git merges and rebases.