From d520ba3b3880fe2d4647b7e5b6a135e699473f63 Mon Sep 17 00:00:00 2001 From: Vincent Date: Fri, 23 Mar 2018 15:46:03 +0100 Subject: [PATCH] Mention correct branch to rebase off of --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 85585cba8..358338685 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -172,7 +172,7 @@ So you wanna make a pull request? Please observe the following guidelines. automatically based on that file and then periodically uploaded to Transifex for translation. * [Rebase](https://nathanleclaire.com/blog/2014/09/14/dont-be-scared-of-git-rebase/) your - changes on the latest `master` branch, resolving any conflicts. + changes on the latest `development` branch, resolving any conflicts. This ensures that your changes will merge cleanly when you open your PR. * Be sure to add and run tests! * Make sure the diff between our master and your branch contains only the