New answers tagged

0

Technically this is hardly a problem, solutions have been presented in other answers. The trouble with this will ultimately be social and organization related. If you have people on the team who do not like the new rules and there is no recognized team lead who is behind the system, these people will continue to sabotage it and make up reasons why you should ...


0

You can't retile the entire office without getting in the way of the staff who works there. Similarly, you can't refactor the entire codebase without affecting active branches (when it's time to merge). You could, for example, retile the office room by room, making sure there's no one in each room as you tile it. The real world analogy here is to run the ...


0

If you have formatted file x that I had checked out, then I can just apply the same formatting to file x myself. With my tools, I can see differences between files before creating a pull request. If I see x has 100 format changes + 10 changes that I made, then after using the formatting tool only my changes should remain. Assuming the formatting tool is ...


1

There is no way around the second problem, but anyone spelunking through history of code will in any case have to have a workflow to step past uninteresting commits one by one (rather than just run git blame on the latest version and stop), so the real problem is the first one (conflict for concurrent PRs). If you can afford to write some additional tooling, ...


2

I don't think there's a painless option. I think the way I would handle this would be to make a declaration that after a specific date, no PRs would be accepted if they don't meet the coding standard. At that date, you apply code formatting to the entire project. Anyone who can't get their PR in before that date will be required to rebase or merge. You ...


6

This causes conflict for all other concurrent PRs. Which could be dozens or even hundreds. This problem can be solved by a little thing we call "coordination", aka "talking to each other". If you want to make large-scale changes like this, you will need to stop everything else you are doing. This might sound scary at first, but consider ...


Top 50 recent answers are included