-
Notifications
You must be signed in to change notification settings - Fork 278
Branch guide
This is the version currently in the play store.
The only changes here should be merges from the release (when the next version is ready) or critical bug fixes for immediate deploy to the store. When changes are made straight into master one of the maintainers will need to merge the master branch back to release and finally develop.
This version is the latest (public) beta. When we are preparing for a store release the develop branch is merged into the release and a beta is created. Any bug fixes found as part of beta testing should go into the release branch. one of the maintainers will need to merge these fixes back to the develop branch.
This is the next version in development. Any changes made here will go into the next cycle. Unless you are bug fixing something critical or a beta (which has not made it to store) then your changes should go here.
If your working on a long running feature and want to include this into the main source repo then your branch should be called feature/MyFeature where "MyFeature" is the name of the feature. In general this work would be done on your own fork of the source repo & then sent as a pull request into the main one.
In your fork you can use any branch names you see fit, but please remember when sending in a pull request to start from and send to the correct branch :) Never create a branch at develop and send to release as you will pickup extra changes that are not meant for this branch!