[airflow] 04/07: Update CONTRIBUTING.rst (#11461)

[po...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

potiuk pushed a commit to branch v1-10-test
in repository https://gitbox.apache.org/repos/asf/airflow.git

commit 70a69874e2e63adc1d5df3d38c5d74d76def1867
Author: Jarek Potiuk <ja...@polidea.com>
AuthorDate: Tue Oct 13 18:07:30 2020 +0200

    Update CONTRIBUTING.rst (#11461)
    
    Co-authored-by: Ash Berlin-Taylor <as...@firemirror.com>
    
    Co-authored-by: Ash Berlin-Taylor <as...@firemirror.com>
    (cherry picked from commit bf9ece79cbebb2a06f435ce94bc5ea1a6065b0ad)
---
 CONTRIBUTING.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 5330485..40e4f89 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -431,6 +431,13 @@ usually these are developers with the release manager permissions.
 Once the branch is stable, the ``v1-10-stable`` branch is synchronized with ``v1-10-test``.
 The ``v1-10-stable`` branch is used to release ``1.10.x`` releases.
 
+The general approach is that cherry-picking a commit that has already had a PR and unit tests run
+against main is done to ``v1-10-test`` branch, but PRs from contributors towards 1.10 should target
+``v1-10-stable`` branch.
+
+The ``v1-10-test`` branch and ``v1-10-stable`` ones are merged just before the release and that's the
+time when they converge.
+
 Development Environments
 ========================