You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by gu...@apache.org on 2017/10/04 04:28:08 UTC
[05/14] incubator-weex git commit: * [doc] update branch flow
* [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/ec4a4ca1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ec4a4ca1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ec4a4ca1
Branch: refs/heads/release-0.16
Commit: ec4a4ca1532931c2043dd02961ebf12273879f7a
Parents: 5a65cc7
Author: gurisxie <27...@qq.com>
Authored: Sat Sep 30 19:33:32 2017 +0800
Committer: gurisxie <27...@qq.com>
Committed: Mon Oct 2 10:52:49 2017 +0800
----------------------------------------------------------------------
CONTRIBUTING.md | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ec4a4ca1/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