Skip to content

Commit

Permalink
[AIRFLOW-XXXX] Adds branching strategy to documentation (apache#7193)
Browse files Browse the repository at this point in the history
(cherry picked from commit 5b0fb42)
  • Loading branch information
potiuk authored and kaxil committed Jan 26, 2020
1 parent d0e6421 commit 89ef28d
Showing 1 changed file with 15 additions and 0 deletions.
15 changes: 15 additions & 0 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 release ``1.10.x`` releases.

Development Environments
========================

Expand Down

0 comments on commit 89ef28d

Please sign in to comment.