From 369728f6c3af84c1d883ec6de9e4082905e253ba Mon Sep 17 00:00:00 2001 From: Brendan LE GLAUNEC Date: Fri, 2 Dec 2016 15:49:58 +0100 Subject: [PATCH] Put Gitflow back in place --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c8f9d15..c405c7a 100644 --- a/README.md +++ b/README.md @@ -279,7 +279,7 @@ The output of Cameradar will be printed on the standard output and will also be Before contributing, make sure the task you want to realize has not been assigned to someone else already, and if not don't forget to assign it to yourself and move it to `In progress` in the [Project page](https://github.com/EtixLabs/cameradar/projects/1). Then before submitting your pull request, please use `clang-format` to format your C++ code and `go-fmt` for Golang code. -You can ask for a merge of your pull request directly on the master branch, as I don't really feel the need for a develop branch at the moment. +You can ask for a merge of your pull request only on the develop branch, and it will be pushed in the master branch in the next release. If you're not into software development or not into C++, even updating the dictionaries would be a really cool contribution! Just make sure the ids and routes you add are **default constructor credentials** and not custom credentials.