Branching Strategy

Rules to live by while working with AppDaemon Branches:

  1. Master branch always reflects the latest release (point, minor or major)
  2. Dev is used as a staging area for new releases, and allows early access and test
  3. Dev is used for assembling minor updates by applying package updates directly through PRs
  4. Minor and major releases have their own branch for the duration of development. Changes to DEV are typically merged into the current release branch when a release happens (or perhaps on an ongoing basis)
  5. No direct new functionality commits to dev or release branches, new code will have it's own feature branch that will be merged to the appropriate release branch when complete
  6. When a release branch is deemed complete, it will be merged with DEV for early access testing
  7. When dev testing is complete, the dev branch will be merged with master and tagged as a release