With a proper workflow and communication, only the first one (rebase conflicts) is a semi-regular occurrence (once a month). The others I have never had to do w

With a proper workflow and communication, only the first one (rebase conflicts) is a semi-regular occurrence (once a month). The others I have never had to do while working on a team. We establish a clear way of working and everyone abides by it. And before you say well this doesn’t work with a bigger team, my team is 8 and the org is 50 on the same codebase. At “google scale”, I understand this might not be the same case. If someone has to go out of that workflow to fix a previous commit on main, they submit a pr on top of latest. Again, I don’t see the major complications here. It seems to me to be fixing a communication issue in an org more than anything.