Workflow when globally renaming a model


I’ve recently been working on a project when we realised a model was badly named, and made the decision to rename it throughout. However, other developers were still creating new branches based on the old model name.

Does anyone have thoughts on handling this when it comes to merging? Our usual practice of rebasing against staging before creating a pull request is causing headaches because of this.