Git

Our git workflow is very simple and normally well known by developers around the world because it's simply based on git-flow.

Branches

Here's the branches schema that has to be followed:

• master: Master branch that represent the published packages.
• hotfix/...: Branches that handle hotfix and will be merged into master and develop
• develop: Main development branch where features, fixes, etc... will be merged.
• feature/...: Feature branches on which maintainers and developers has to work.

Why no release branch?

For now, we are going to use the tags to mark releases on the master branch. This may change in futur but for now, it's the way it is...

Pull request

To send you code back to the main repository, please make use of the pull request feature on Github. This will act as a "security" layer and ensure that all we merge in the project is well tested, works perfectly as intended, etc... Nothing against you guys! :)

Mainly, you will work on new features and fixes. This will be materialised in your git with feature/... and hotfix/... branches that you will propose as pull request once you are ready. Your code will be checked just to be sure all works properly and that your proposition is line with the project trajectory.

Once all is ok, your code will be merged, released if it's a fix and scheduled in the next release if it's a new feature.

Then, and ONLY then, you will be pleased to drink a nice and fresh bier. (if you have enough chance, it will even be offered by the Coffeekraken community!).