From 76e53f2081d816af7aed13de77e44a2fc39d6a04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Tue, 16 Jan 2018 08:42:40 +0200 Subject: [PATCH] Make contribution instructions more concise The instructions now separate the two parts more clearly so that bug fixes are always done to the oldest possible version. --- CONTRIBUTING.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 69af32211..61f666a74 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -17,9 +17,8 @@ Without this comment, the pull request will not be accepted. ## Practicalities * Please ensure that your pull-request has been made against the correct - branch. For bug fixes or minor improvements, use the default branch and for - new code, use the `develop` branch (e.g. for a patch to 2.1.x, use the `2.1` - branch). + branch. For bug fixes or minor improvements, use the default branch (at the + time of writing `2.1`). For new features, use the `develop` branch. * Please ensure that your code follows our [Coding Style](https://github.com/mariadb-corporation/MaxScale/wiki/Coding-Style-and-Guidelines). All new code should be formatted with the