From 5eb6190682cae5831bed5154ec4bb0eca457661a Mon Sep 17 00:00:00 2001 From: olly Date: Thu, 28 Jul 2016 09:28:21 -0700 Subject: [PATCH] Fix branch documentation ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=128707067 --- CONTRIBUTING.md | 5 +++-- README.md | 15 +++++++++------ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6d1e21957f..2559901b0b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -17,8 +17,9 @@ gives some examples of what to include. ## Pull requests ## We will also consider high quality pull requests. These should normally merge -into the [dev][] branch rather than master. To contribute in this way you must -first submit a Contributor License Agreement, as described below. +into the `dev-vX` branch with the highest major version number. Bug fixes may +be suitable for merging into older `dev-vX` branches. Before a pull request can +be accepted you must submit a Contributor License Agreement, as described below. [dev]: https://github.com/google/ExoPlayer/tree/dev diff --git a/README.md b/README.md index edb10d4e58..3731ddda0b 100644 --- a/README.md +++ b/README.md @@ -64,12 +64,15 @@ and copy `library.jar` to the libs folder of your new project. #### Project branches #### - * The [`master`][master] branch holds the most recent minor release. - * Most development work happens on the [`dev`][dev] branch. - * Additional development branches may be established for major features. - -[master]: https://github.com/google/ExoPlayer/tree/master -[dev]: https://github.com/google/ExoPlayer/tree/dev + * The project has `dev-vX` and `release-vX` branches, where `X` is the major + version number. + * Most development work happens on the `dev-vX` branch with the highest major + version number. Pull requests should normally be made to this branch. + * Bug fixes may be submitted to older `dev-vX` branches. When doing this, the + same (or an equivalent) fix should also be submitted to all subsequent + `dev-vX` branches. + * A `release-vX` branch holds the most recent stable release for major version + `X`. #### Using Android Studio ####