Git Flow

Current Flow

1. All new work should be done in a new feature branch either in this repo or in a contributor's personal fork of this repo.
2. When ready, the contributor should submit a PR from their feature branch (either in this repo or their fork) to the master branch, which then must pass all checks
3. Another user should either approve the PR, reject the PR, or request changes
4. Then, if the PR was approved, a Cloud Railway team member should merge the PR

Legacy Flow

1. All new work should be done in a new feature branch either in this repo or in a contributor's personal fork of this repo.
2. When ready, the contributor should submit a PR from their feature branch (either in this repo or their fork) to the develop branch, which then must pass all checks
3. Another user should either approve the PR, reject the PR, or request changes
4. Then, if the PR was approved, the contributor who submitted the PR should
   1. Merge the PR to the develop branch
   2. Create a PR from develop to master
   3. Merge the PR to master
   4. Create a tag on the head of the master branch with git tag -a '1.0.0' -m 'tag description' where 1.0.0 is the version (without a 'v' prefix) and tag description is a description of the changes in the new tag
   5. Push the new tag to this repo with git push origin --tags
   6. Draft a new release in the Release tab in Github (again without the 'v' prefix)