I train my team on how to resolve this. Every team member is able to resolve a force push onto a branch they have local.
Also, we tend to avoid having multiple people work on the same branch.. so, that's also a thing.
If there was a multi-person development effort, then each of those people would have to have a sub-branch of a main feature, and then they would be rebasing their work onto the 'main' feature branch.. which would ultimately be rebased on to dev.. etc.
Also, we tend to avoid having multiple people work on the same branch.. so, that's also a thing.
If there was a multi-person development effort, then each of those people would have to have a sub-branch of a main feature, and then they would be rebasing their work onto the 'main' feature branch.. which would ultimately be rebased on to dev.. etc.