(In other words: "We will hold up PEP 8 violations by other tools as reasons not to use them, while simultaneously mandating behavior that specifically violates PEP 8.")
We switched from Mercurial to git, and at the same time, from usually merging (I think) to heavily favoring rebases.
Back then, we only had to fix merge conflicts one time each. Just think of all the character-building we missed out on!