* [doc] update branch flow
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e8820912 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e8820912 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e8820912 Branch: refs/heads/release-0.16 Commit: e88209120e0fd64dab7ff39c3775b93fa313c22e Parents: 64510dd Author: gurisxie <279483...@qq.com> Authored: Sat Sep 30 19:33:32 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Wed Oct 4 16:21:38 2017 +0800 ---------------------------------------------------------------------- CONTRIBUTING.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e8820912/CONTRIBUTING.md ---------------------------------------------------------------------- diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a688622..e30a65c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -17,20 +17,20 @@ Besides Weex dev mailing list, we also have some other mailing lists for you. Yo ## Branch Management ``` -master +release â -dev <--- PR(hotfix/typo/3rd-PR) +master <--- PR(hotfix/typo/3rd-PR) â PR -{domain}-feature-{date} +{domain}-feature-{point} ``` -0. `master` branch - 0. `master` is the latest (pre-)release branch. -0. `dev` branch - 0. `dev` is the stable developing branch. - 0. ***It's RECOMMENDED to commit hotfix (like typo) or feature PR to `dev`***. -0. `{domain}-feature-{date}` branch - 0. The branch for a developing iteration, e.g. `android-feature-20160607` is an android developing iteration which is done at 2016.06.07. `{domain}` consists of `android`, `ios`, `jsfm` and `html5`. +0. `release` branch + 0. `release ` is the latest release branch. +0. `master ` branch + 0. `master ` is the stable developing branch. + 0. ***It's RECOMMENDED to commit hotfix (like typo) or feature PR to `master `***. +0. `{domain}-feature-{point}` branch + 0. The branch for a developing iteration, e.g. `android-feature-list-update` is an android developing iteration which is for list update. `{domain}` consists of `android`, `ios`, `jsfm` and `html5`. 0. **DO NOT commit any PR to such a branch**. ### Branch Name