kaxil commented on code in PR #41354: URL: https://github.com/apache/airflow/pull/41354#discussion_r1711416401
########## contributing-docs/10_working_with_git.rst: ########## @@ -27,33 +27,37 @@ that we are using rebase workflow. It also explains how to sync your fork with t Airflow Git Branches ==================== -All new development in Airflow happens in the ``main`` branch. All PRs should target that branch. +All new development in Airflow happens in the ``main`` branch which is now Airflow 3. All PRs should target that branch. -We also have a ``v2-*-test`` branches that are used to test ``2.*.x`` series of Airflow and where maintainers +We also have a ``v2-10-test`` branch that are used to test ``2.10.x`` series of Airflow 2 and where maintainers cherry-pick selected commits from the main branch. -Cherry-picking is done with the ``-x`` flag. +For Contributors: +All bug fixes after 2.10.0 release will target Airflow 3. We will make the best effort to make them available in 2.10.x, +but if somebody wants to guarantee that a fix is included in 2.10.x, they need to raise the PR explicitly to the v2-10-test branch too. -The ``v2-*-test`` branch might be broken at times during testing. Expect force-pushes there so -maintainers should coordinate between themselves on who is working on the ``v2-*-test`` branch - -usually these are developers with the release manager permissions. +For Committers: Review Comment: ```suggestion *For Committers*: ``` -- 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. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
