Because the code in the master branch is useable for the intended purposes (albeit buggy and not 99% [hah!] safe), we should cease development in the master branch. Instead, we’ll merge to this branch as features are added and tested.
I’ve created two branches in MorphyLib for working on separate aspects of the project.
I’m adding features to the library, such as support for weighting and ordered characters. I’m adding these on the development branch. In the meantime, the master branch is usable. I won't rename or re-parameterise any MorphyLib API functions without sending around a heads-up.
If you’re working on the R parts of the project, checkout the Rdev branch and make your changes there.
Thus, morphylib-specific changes are done on the development branch, while R-specific changes are done on the Rdev branch. If we adhere to this, we shouldn't have any merge conflicts.
Because the code in the master branch is useable for the intended purposes (albeit buggy and not 99% [hah!] safe), we should cease development in the master branch. Instead, we’ll merge to this branch as features are added and tested.
I’ve created two branches in MorphyLib for working on separate aspects of the project.
I’m adding features to the library, such as support for weighting and ordered characters. I’m adding these on the development branch. In the meantime, the master branch is usable. I won't rename or re-parameterise any MorphyLib API functions without sending around a heads-up.
If you’re working on the R parts of the project, checkout the Rdev branch and make your changes there.
Thus, morphylib-specific changes are done on the
developmentbranch, while R-specific changes are done on theRdevbranch. If we adhere to this, we shouldn't have any merge conflicts.