From b4f74e805722559efc62c6549c4251a535b11c8f Mon Sep 17 00:00:00 2001 From: Olle Harstedt Date: Tue, 3 Nov 2020 15:11:36 +0100 Subject: [PATCH] Dev: Adjust CONTRIBUTING.md --- CONTRIBUTING.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 057a7890a0f..f7a6c959355 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -20,12 +20,11 @@ top of things. ## Making changes * Create a topic branch from where you want to base your work. - * This is usually the master branch. - * Only target release branches if you are certain your fix must be on that - branch. - * To quickly create a topic branch based on master; `git checkout -b - fix/master/my_contribution master`. Please avoid working directly on the - `master` branch. + * Bug fixes go into the master branch + * New features go into the develop branch + * To quickly create a topic branch based on develop; `git checkout -b + fix/develop/my_contribution develop`. Please avoid working directly on the + `develop` or `master` branch. * Make commits of logical units. * Check for unnecessary whitespace with `git diff --check` before committing. * Make sure your commit messages are in the proper format - check out our