Development Model

Jump to bottom

raistlinthewiz edited this page Oct 18, 2014 · 2 revisions

You can read below the development model we use within the process;

The model is based on http://nvie.com/posts/a-successful-git-branching-model/

Basically we need two core branches;

master (default branch with stable & tested code)
develop ( development branch with next-gen code that still needs proper testing)

Feature branches; Our proposal follows http://nvie.com/posts/a-successful-git-branching-model/ and PR's will be named in this format; "feature-FUNCTIONALITY-DESCRIPTION".

A proper PR should be referencing the issue that it fixes. I've also put a basic developer guide here.

Tags Tagging releases will be quite useful.

Milestones The new model will also allow us to utilize the git's milestone's feature, so we can target releases.

The plan

Utilize the feature-XYZ branching model.
Setup a new milestone for basic functionality targets
Merge develop to master once we hit our milestones targets and tag them.
Continue to follow the model.

With all this branching model a pool operator can just;

stay in master branch and use the latest stable & tested code
stay with develop branch and merge the latest upstream changes
can just merge in a feature-XYZ branch for cutting-edge features & testing.