mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Mention correct branch to rebase off of

Browse source
This commit is contained in:
Vincent 2018-03-23 15:46:03 +01:00 • committed by Scott Nonnenberg
parent 5b5903c70e
commit d520ba3b38
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CONTRIBUTING.md
View file

@ -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 automatically based on that file and then periodically uploaded to Transifex for
translation. translation.
* [Rebase](https://nathanleclaire.com/blog/2014/09/14/dont-be-scared-of-git-rebase/) your * [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. This ensures that your changes will merge cleanly when you open your PR.
* Be sure to add and run tests! * Be sure to add and run tests!
* Make sure the diff between our master and your branch contains only the * Make sure the diff between our master and your branch contains only the