diff --git a/README.md b/README.md index 7ebed741ce..d4844b98a2 100644 --- a/README.md +++ b/README.md @@ -16,29 +16,6 @@ The framework is easy to adjust to meet your needs, because Yii has been designe [![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/yiisoft/yii2/badges/quality-score.png?s=b1074a1ff6d0b214d54fa5ab7abbb90fc092471d)](https://scrutinizer-ci.com/g/yiisoft/yii2/) [![Code Climate](https://img.shields.io/codeclimate/github/yiisoft/yii2.svg)](https://codeclimate.com/github/yiisoft/yii2) -分支说明 -------- -* master:主分支 -* doc:文档翻译分支 -* api:api 翻译分支 - -## 官方新版本发布 -doc branch: -``` -git merge upstream/master -``` -api branch: -``` -git merge upstream/master -``` -master branch: -``` -git merge doc -git merge api -``` -> 注意:禁止提交 pull request 至 master 分支,文档修改请提交至 doc 分支,api 修改请提交至 api 分支。 - - Installation ------------