I'd say, merge framework upgrade to develop/master (depends on how you organize your git workflow), rebase feature branches on top, resolve conflicts, run tests, do code review, then merge them as well.
But if you're making feature branches big with a lot of commits, rebasing may take a lot of time and effort. Also, after rebasing you need to make sure that each commit contains code that compiles, because should you decide to revert code at some point, you need some guarantees that nothing will break.
So try to keep your feature branches small and isolated as well.
And doing research before upgrading also helps. At least you'll know what might brake and cater for that accordingly.
For further actions, you may consider blocking this person and/or reporting abuse
We're a place where coders share, stay up-to-date and grow their careers.
I'd say, merge framework upgrade to
develop/master(depends on how you organize your git workflow), rebase feature branches on top, resolve conflicts, run tests, do code review, then merge them as well.But if you're making feature branches big with a lot of commits, rebasing may take a lot of time and effort. Also, after rebasing you need to make sure that each commit contains code that compiles, because should you decide to revert code at some point, you need some guarantees that nothing will break.
So try to keep your feature branches small and isolated as well.
And doing research before upgrading also helps. At least you'll know what might brake and cater for that accordingly.