|
|
We want to keep our git workflow fairly clean. The basic outline is as follows:
|
|
|
|
|
|
### Branches
|
|
|
|
|
|
* master - For releases; all tests pass
|
|
|
* develop - For work in progress/snapshots. Tests should pass.
|
|
|
* feature/* - Branches for adding features (e.g. new REST API). Tests need not pass.
|
|
|
* bug/* - Branches for bug fixes.
|
|
|
|
|
|
### Merging
|
|
|
|
|
|
* Feature branches should have merge requests to make it into the development branch.
|
|
|
* For merging develop into master, see the release cycle (tbd)
|
|
|
* Likewise bug fixes can be merge into either the master or develop, depending on the release they are targeted for
|
|
|
|
|
|
### Versioning
|
|
|
|
|
|
* x.y.z
|
|
|
* x - Major version. Don't know when we'll actually hit 2.
|
|
|
* y - Minor version. Contains changes which are for both the replication/ingest/intake services. Requires a new release for all services.
|
|
|
* z - Bug fixes. Any issues which arise during the lifetime of a minor release and can be resolved without needing an upgrade to all services. |
|
|
\ No newline at end of file |