This is part of the Semicolon&Sons Code Diary - consisting of lessons learned on the job. You're in the workflows category.
Last Updated: 2024-11-21
I wanted to lint and reformat all the files in a couple of codebases that other people were actively working on. I did so in a branch that added unrelated features. (I couldn't wait to lint because the weird formatting drove me nuts).
But it was only a week later that I got the chance to merge my formatted code with the main stream. Of course there were tons of conflicts, since people had been working on the old code ever since, old which had dramatically different formatting conventions. Therefore, in future, I will ask everyone to commit that evening, then lint myself that night and push, then everyone will be able to work from the freshly linted code the next day.