“If you want to change the formatting, warn people to merge any big PRs that are ready. Then, you fix any merge conflicts that result in the outstanding featur

“If you want to change the formatting, warn people to merge any big PRs that are ready. Then, you fix any merge conflicts that result in the outstanding feature branches. Do this twice; once as a dry run where you get the tests to keep passing, and once for real while the team pauses merges for a short window.” In general, any software engineering thing that causes multiplicative work for the rest of the org should be handled this way. For instance, at a prior job, it cost 100+ engineers a week or so of productivity to rename master to main because tooling and automation had hardcoded master all over the place. It cost the person that initiated the change an hour or so, and I’m sure it helped their promotion case. Of course, accounting didn’t compute the cost of this to the business ahead of time. If they had, I’d hope they would have insisted we spend the money on recruiting and hiring more diverse candidates instead.