This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/master by this push:
new bf9ece7 Update CONTRIBUTING.rst (#11461)
bf9ece7 is described below
commit bf9ece79cbebb2a06f435ce94bc5ea1a6065b0ad
Author: Jarek Potiuk <[email protected]>
AuthorDate: Tue Oct 13 18:07:30 2020 +0200
Update CONTRIBUTING.rst (#11461)
Co-authored-by: Ash Berlin-Taylor <[email protected]>
Co-authored-by: Ash Berlin-Taylor <[email protected]>
---
CONTRIBUTING.rst | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index d1511fa..3731713 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -371,6 +371,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
========================
