Workflows - iToto/developmentCycle GitHub Wiki

We decided to break down the cycle into scenarios. The scenarios are as follows:

New features are just like they sound. New functionality we are adding to the application. These are kept in a separate branch from bug fixes as they are more likely to introduce new bugs.

A hotfix’ purpose is to handle a critical issue that has arisen in a release that must be addressed immediately and released upon completion.

Bugs arise during use of an application and are to be fixed based no the latest stable version. Bug fixes are periodically released.

• The develop branch will have all latest features to be tested before the next release.
• Feature Pull Requests should only be merged if that feature is scheduled to be included in the next release.
• Bugs found during BETA testing should be considered important as we want to try to minimize the bugs on a release.

• When ready to release, we put a hold on merging new Pull Requests
• During this time, we try to stabilize Upstream/develop branch
• Once the develop branch is deemed stable, we make a Pull Request from Upstream/develop into Upstream/master
• The Pull Request is merged and a tag is created with the release/version number