diff options
| author | Brad King <brad.king@kitware.com> | 2018-03-15 11:58:27 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-03-15 11:58:33 (GMT) |
| commit | 018946aaafc9ada6852d55cb8034faf0f4c1afbc (patch) | |
| tree | f5274eaeb78ddecad3b097bcdebd1d659d244dfd | |
| parent | 2ab900c71b21a0faae46573c2720d867a896bb29 (diff) | |
| parent | 27502491dd0500144311cf31750ed5fa24ac5988 (diff) | |
| download | CMake-018946aaafc9ada6852d55cb8034faf0f4c1afbc.zip CMake-018946aaafc9ada6852d55cb8034faf0f4c1afbc.tar.gz CMake-018946aaafc9ada6852d55cb8034faf0f4c1afbc.tar.bz2 | |
Merge topic 'clarify-contributing-doc'
27502491dd CONTRIBUTING: Clarify choice of master or release branch as a base
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
Merge-request: !1845
| -rw-r--r-- | CONTRIBUTING.rst | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 381769d..fa2c23d 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. |