...
If you are making changes to PLFM's API and also are changing a client to reflect these changes, then:
(to edit this document, goto https://docs.google.com/a/sagebase.org/drawings/d/1X05G5t_8tzW8lQjroQQk3HH9aTHYyvFZfPMg1eckTuU/edit)
- pull from the client's master branch (creating a local branch for development)
...
- run pomVersioner.py to increment version, e.g. from 0.13.1.1 to 0.13.1.2
to incorporate 1
- push to 0.13.1.1
- push to the client's master branch
- on PLFM, git checkout master
- pull from remote
- merge the API-stable branch's changes
- resolve any conflict and get a clean build
- run the pomVersioner to increment the master's version, e.g. to 0.13.2-SNAPSHOT
- push to the PFLM master branch
Incorporating PLFM master with the API-stable branch
Say the latest API-stable branch is 0.13.71.
Pull
1) git checkout -b 0.13.8
...