[GitHub] [airflow] feluelle commented on a change in pull request #7193: [AIRFLOW-XXXX] Adds branching strategy to documentation

[GitBox <gi...@apache.org>]

feluelle commented on a change in pull request #7193: [AIRFLOW-XXXX] Adds branching strategy to documentation
URL: https://github.com/apache/airflow/pull/7193#discussion_r367875639
 
 

 ##########
 File path: CONTRIBUTING.rst
 ##########
 @@ -152,6 +152,21 @@ these guidelines:
 -   Adhere to guidelines for commit messages described in this `article <http://chris.beams.io/posts/git-commit/>`__.
     This makes the lives of those who come after you a lot easier.
 
+Airflow Git Branches
+====================
+
+All new development in Airflow happens in ``master`` branch. All PRs should target that branch.
+We also have ``v1-10-test`` branch which is used to test ``1.10.x`` series of Airflow and where committers
+(and only committers) cherry-pick selected commits from the master branch.
+Cherry-picking is done with -x flag.
+
+The ``v1-10-test`` branch might be broken at times during testing. Expect force-pushes there so
+committers should coordinate between themselves on who is working on the ``v1-10-test`` branch -
+usually those will be people with the role of the release manager.
+
+Once the branch is stable - the ``v1-10-stable`` branch is synchronized with ``v1-10-test``.
+The ``v1-10-stable`` branch is used to relsease ``1.10.x`` releases.
 
 Review comment:
   ```suggestion
   The ``v1-10-stable`` branch is used to release ``1.10.x`` releases.
   ```

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services