...
| PLFM Branch Choice | Advantages | Disadvantages |
|---|---|---|
| master | May 'break' client; need not verify client functionality. | Changes are not immediately available to client developers. |
| API-stable | Changes are immediately available to client developers | Developer must ensure client functionality. |
Workflow
(to edit diagram, go to https://docs.google.com/a/sagebase.org/drawings/d/1s2zCr57TOajuuMHnD8xMXWVIWmPDINNE-MTFSMlNx4U/edit)
1) If you're working on PLFM and the changes *don't* need to be used immediately by clients, then you may work off of the 'master' branch. Pull from the remote master, create a branch for your work, code and test, then merge back into master and push to github.
...