v1.0.2 was advertised as the first release incorporating the SeismicTrace toolkit as a replacement for The Waveform Suite. However, Celso has not yet had time to complete and fully integrate this work into GISMO. So in version 1.1.0 I have re-instated The Waveform Suite, and further debugged it, especially with regard to loading waveform data from Antelope databases. However, documentation, issue fixing and extensive testing are still needed.
From this point on I will endeavor to follow the Git Branching Model described by Vincent Driessen at http://nvie.com/posts/a-successful-git-branching-model/
In short:
- master branch should only contain tagged versions / releases
- develop branch is basis for all new development
- feature (e.g. feature/seismic_trace_toolkit) branches are created from develop branch
- release branches (e.g. release_1.1.1) are created from develop branch, and once started, no new features are added - just bug fixing
- once release branch in finalized, it is merged into master and tagged as a new version (and then documented here). It is also merged into develop (which may have changed since release branch was first made, so may have some manual merging to do)
- release branch can then be removed
- feature branches may develop over several release cycles before they are reading to merge back into develop and become part of a release