From ba3a5fb1f0ce68edf3303e602908ad161148090d Mon Sep 17 00:00:00 2001 From: Thomas VIAL Date: Thu, 28 Apr 2016 00:02:56 +0200 Subject: [PATCH] Updated How to contribute (markdown) --- docs/content/how-to-contribute.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/docs/content/how-to-contribute.md b/docs/content/how-to-contribute.md index a1107a99..a29949ee 100644 --- a/docs/content/how-to-contribute.md +++ b/docs/content/how-to-contribute.md @@ -16,10 +16,7 @@ When `v2` will be released, the development workflow will be: - 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 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` +- Commit, push and make a pull-request +- When tests are green, your branch is merged to `master` - Docker builds a new `latest` image