diff options
| author | Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com> | 2018-03-12 23:39:32 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-03-15 07:56:30 -0400 |
| commit | 27502491dd0500144311cf31750ed5fa24ac5988 (patch) | |
| tree | a875c78affdd9336d84ef9a6b13369e40e792fd3 /CONTRIBUTING.rst | |
| parent | 89d00bfcee33a724a9a51e5a7cf40ab0785d9a9b (diff) | |
| download | cmake-27502491dd0500144311cf31750ed5fa24ac5988.tar.gz | |
CONTRIBUTING: Clarify choice of master or release branch as a base
Diffstat (limited to 'CONTRIBUTING.rst')
| -rw-r--r-- | CONTRIBUTING.rst | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 381769d161..fa2c23d903 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -29,6 +29,8 @@ To contribute patches: #. Base all new work on the upstream ``master`` branch. Base work on the upstream ``release`` branch only if it fixes a regression or bug in a feature new to that release. + If in doubt, prefer ``master``. Reviewers may simply ask for + a rebase if deemed appropriate in particular cases. #. Create commits making incremental, distinct, logically complete changes with appropriate `commit messages`_. #. Push a topic branch to a personal repository fork on GitLab. |