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/17 08:25:20 UTC
[07/50] incubator-weex git commit: * [doc] update for branch flow
* [doc] update for 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/4bc65365
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/4bc65365
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/4bc65365
Branch: refs/heads/release-0.16
Commit: 4bc653653c1460dcad0642ef654e593c89ebaaf1
Parents: 9ac7c0e
Author: gurisxie <27...@qq.com>
Authored: Mon Oct 9 14:17:11 2017 +0800
Committer: gurisxie <27...@qq.com>
Committed: Mon Oct 9 14:17:11 2017 +0800
----------------------------------------------------------------------
.github/PULL_REQUEST_TEMPLATE.md | 4 ++--
CONTRIBUTING.md | 22 +++++++++++-----------
doc/source/cn/guide/contributing.md | 27 ++++++++++++++-------------
doc/source/guide/contributing.md | 26 +++++++++++++-------------
4 files changed, 40 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4bc65365/.github/PULL_REQUEST_TEMPLATE.md
----------------------------------------------------------------------
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 0a6fb20..fea8dd9 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -48,13 +48,13 @@ Thank you for your support.
<!--
（请在***提交***前删除这段描述）
-It's ***RECOMMENDED*** to submit typo fix, new demo and tiny bugfix to `master` branch. New feature and other modifications can be submitted to "domain" branch including `ios`, `android`, `jsfm`, `html5`.
+It's ***RECOMMENDED*** to submit typo fix, new demo, tiny bugfix and large feature to `master` branch.
See [Branch Strategy](https://github.com/alibaba/weex/blob/dev/CONTRIBUTING.md#branch-management) for more detail.
----
-错别字修改、新 demo、较小的 bugfix 都可以直接提到 `master` 分支；新需求以及任何你不确定影响面的改动，请提交到对应“领域”的分支（`ios`、`android`、`jsfm`、`html5`）。
+错别字修改、新 demo、较小的 bugfix、甚至较大的功能都可以直接提到 `master` 分支；
查看完整的[分支策略 (英文)](https://github.com/alibaba/weex/blob/dev/CONTRIBUTING.md#branch-management)。
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4bc65365/CONTRIBUTING.md
----------------------------------------------------------------------
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e30a65c..b9294a1 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -19,21 +19,21 @@ Besides Weex dev mailing list, we also have some other mailing lists for you. Yo
```
release
↑
-master <--- PR(hotfix/typo/3rd-PR)
- ↑ PR
-{domain}-feature-{point}
+release-{version}
+ ↑
+master <--- PR(feature/hotfix/typo)
```
-0. `release` branch
- 0. `release ` is the latest release branch.
-0. `master ` branch
- 0. `master ` is the stable developing 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**.
+0. `release-{version}` branch
+ 0. `release-{version}` is used for every version which we consider for stable publish.
+ 0. e.g. `release-0.16`
+0. `release` branch
+ 0. `release` is the latest release branch,we will make tag and publish version on this branch.
-### Branch Name
+### Branch Name For PR
```
{module}-{action}-{shortName}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4bc65365/doc/source/cn/guide/contributing.md
----------------------------------------------------------------------
diff --git a/doc/source/cn/guide/contributing.md b/doc/source/cn/guide/contributing.md
index 36db1f9..32e735b 100644
--- a/doc/source/cn/guide/contributing.md
+++ b/doc/source/cn/guide/contributing.md
@@ -25,23 +25,24 @@ version: 2.1
## 分支管理 (英)
```
-master
+release
↑
-dev <--- PR(hotfix/typo/3rd-PR)
- ↑ PR
-{domain}-feature-{date}
+release-{version}
+ ↑
+master <--- PR(feature/hotfix/typo)
```
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. **DO NOT commit any PR to such a branch**.
-
-### 分支命名
+ 0. `master` is the stable developing branch.
+ 0. ***It's RECOMMENDED to commit hotfix (like typo) or feature PR to `master `***.
+0. `release-{version}` branch
+ 0. `release-{version}` is used for every version which we consider for stable publish.
+ 0. e.g. `release-0.16`
+0. `release` branch
+ 0. `release` is the latest release branch,we will make tag and publish version on this branch.
+
+### 用于PR的分支命名
+
```
{module}-{action}-{shortName}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4bc65365/doc/source/guide/contributing.md
----------------------------------------------------------------------
diff --git a/doc/source/guide/contributing.md b/doc/source/guide/contributing.md
index ea824f4..0d4ba82 100644
--- a/doc/source/guide/contributing.md
+++ b/doc/source/guide/contributing.md
@@ -25,23 +25,23 @@ 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)
- ↑ PR
-{domain}-feature-{date}
+release-{version}
+ ↑
+master <--- PR(feature/hotfix/typo)
```
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. **DO NOT commit any PR to such a branch**.
-
-### Branch Name
+ 0. `master` is the stable developing branch.
+ 0. ***It's RECOMMENDED to commit hotfix (like typo) or feature PR to `master `***.
+0. `release-{version}` branch
+ 0. `release-{version}` is used for every version which we consider for stable publish.
+ 0. e.g. `release-0.16`
+0. `release` branch
+ 0. `release` is the latest release branch,we will make tag and publish version on this branch.
+
+### Branch Name For PR
```
{module}-{action}-{shortName}