You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
kiwipuppeh edited this page Oct 22, 2015
·
1 revision
Branch Layout
To ensure the maximum stability of the client, at minimum this project will have 3 branches.
release - release code, should not be pushed to directly, anything that gets merged into here from testing branch will automatically get deployed for everyone to download.
testing - testing new features that are about to be released (we are in progress of pushing the update), this is where if we are not pushing a new build, that hot-fixes be tested as well. (this should not contain new code until a full new build is about to be pushed to master, the public)
build/<version> - the current build that you are working on, only working commits should be pushed here
feature/<name> - for developers working on individual features, these get pushed into the build/version number when they have been tested and known working.
hotfix/<name> - these are for fixing bugs that are already in the wild (release branch), work on the hot-fix, test it and then push it to testing. Once it passes testing and no further bugs are encountered, push to release.
With this logic, master should only be pushed to via testing. This allows CI solutions to be set up to automatically build, package and deploy updates.