> These two seem to contradict.
No, one is about the code, and the other is about the patches.
Cosmetic inconsistencies in the code are undesirable, but not really
important, so there's no need to be rigid about them.
Cosmetic changes cause spurious conflicts, so we definitely do not
like them.
Stefan