diff options
author | Brad King <brad.king@kitware.com> | 2017-07-21 15:26:56 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2017-07-21 15:31:59 (GMT) |
commit | d5030124bb13ba9419ffce73828e8e7fd778d2f4 (patch) | |
tree | 621060990f5c32e9bf6ca1d155a06e27ed245a60 /CONTRIBUTING.rst | |
parent | af9708881f4c2d8f501ae63a4088c020edb6f070 (diff) | |
download | CMake-d5030124bb13ba9419ffce73828e8e7fd778d2f4.zip CMake-d5030124bb13ba9419ffce73828e8e7fd778d2f4.tar.gz CMake-d5030124bb13ba9419ffce73828e8e7fd778d2f4.tar.bz2 |
CONTRIBUTING: Explain how to propose changes to the release branch
Diffstat (limited to 'CONTRIBUTING.rst')
-rw-r--r-- | CONTRIBUTING.rst | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index e219763..3c84c2b 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -27,9 +27,12 @@ To contribute patches: #. Run `Utilities/SetupForDevelopment.sh`_ for local configuration. #. See the `CMake Source Code Guide`_ for coding guidelines. #. 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. #. Create commits making incremental, distinct, logically complete changes. #. Push a topic branch to a personal repository fork on GitLab. -#. Create a GitLab Merge Request targeting the upstream ``master`` branch. +#. Create a GitLab Merge Request targeting the upstream ``master`` branch + (even if the change is intended for merge to the ``release`` branch). The merge request will enter the `CMake Review Process`_ for consideration. |