Those who follow the
JuliaStats world will be aware that a major upgrade of
StatsModels just landed as v"0.6.0", aka “Terms 2.0”. Thanks to @dave.f.kleinschmidt for leading the development on this.
I have a “terms2.0” branch in the
MixedModels package repository that uses this new formulation, which I would like to incorporate into the “master” branch. The development branch is about 150 commits ahead and 20 commits behind master.
What is a good strategy to merge such a development branch into the master branch?
Should I try to rebase terms2.0 on master first? Some things get a bit tricky there because both branches switched from REQUIRE to Project.toml so there are commits that change a REQUIRE file that is no longer part of the project.
I know that at some point I want to collapse all the changes in the terms2.0 branch to a single commit on the master branch, as @dave.f.kleinschmidt did in
StatsModels. I just not sure exactly when that is done.