From 9879d7a80aba0bea6ae1a514e22e2643dcbd3300 Mon Sep 17 00:00:00 2001 From: Thomas VIAL Date: Wed, 27 Apr 2016 23:56:55 +0200 Subject: [PATCH] Updated How to contribute (markdown) --- docs/content/how-to-contribute.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/docs/content/how-to-contribute.md b/docs/content/how-to-contribute.md index cab31ffa..b5124751 100644 --- a/docs/content/how-to-contribute.md +++ b/docs/content/how-to-contribute.md @@ -10,12 +10,15 @@ When `v2` will be released, the development workflow will be: -- Fork -- Improve +- Fork and clone your fork +- Create a branch using `git checkout -b branch_name` +- Code :-) - Add integration tests in `test/tests.bats` - Use `make` to build image locally and run tests - Document your improvements - Commit, push and make a pull-request on `develop` branch -- When tests are green, your branch is merged and tested on real servers by contributors -- When feedback is positive, develop is merged on master +- When tests are green, your branch is merged to `develop` +- Docker builds a new `develop` image +- `:develop` image is tested on real servers by contributors +- When feedback is positive, `develop` is merged on `master`