There are still the following development branches (which are presumably on MPS 2020.1):
I propose the following approach: migrate each branch separately up to the same MPS version as main and then zip up and copy the contents over HEAD of main and see what the changes are and if they are still relevant. The reason to do it like this is because there has been cleanup in the history and the branches will not be properly compatible anymore without any fancy git magic like squashing, rebasing, or even grafting.
There are still the following development branches (which are presumably on MPS 2020.1):
I propose the following approach: migrate each branch separately up to the same MPS version as main and then zip up and copy the contents over HEAD of main and see what the changes are and if they are still relevant. The reason to do it like this is because there has been cleanup in the history and the branches will not be properly compatible anymore without any fancy git magic like squashing, rebasing, or even grafting.