summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2016-06-24 10:12:22 +0800
committerruki <[email protected]>2016-06-24 10:12:22 +0800
commit0ea567263539b6ce80987b7985c21e904d7aa4d0 (patch)
tree918b14d8005c67f8a8bd0e61138fee6a51a76ce1
parentf5bcbc0e3416bfc42b0c6bf3cece2cd1b3d3b2e5 (diff)
update CONTRIBUTING.md
-rw-r--r--CONTRIBUTING.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 40fab9059..13aa77c18 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -21,6 +21,7 @@ try to follow these guidelines when you do so.
* Write good commit messages.
* Use the same coding conventions as the rest of the project.
* Ensure your edited codes with four spaces instead of TAB.
+* Please commit code to `dev` branch and we will merge into `master` branch in feature
# 贡献代码
@@ -40,5 +41,6 @@ try to follow these guidelines when you do so.
* 编写友好可读的提交信息
* 请使用余工程代码相同的代码规范
* 确保提交的代码缩进是四个空格,而不是tab
+* 请提交代码到`dev`分支,如果通过,我们会在特定时间合并到`master`分支上
[1]: https://github.com/waruqi/xmake/issues