No need CONTRIBUTORS.md

Signed-off-by: Jianhui Zhao <jianhuizhao329@gmail.com>
main
Jianhui Zhao 2017-12-11 17:19:33 +08:00
parent 84a887d5bf
commit 01503b3128
3 changed files with 10 additions and 17 deletions

View File

@ -22,14 +22,12 @@ If you want to contribute to [libuhttp](https://github.com/zhaojh329/libuhttp),
4. Make your changes 4. Make your changes
5. Don't forget to add yourself in `CONTRIBUTORS.md`. 5. Commit and push your changes, then make a pull request from Github.
6. Commit and push your changes, then make a pull request from Github. git commit --signoff
git commit --signoff
git push git push
7. Awaiting review, if accepted, merged! 6. Awaiting review, if accepted, merged!
**IMPORTANT** **IMPORTANT**
@ -39,4 +37,4 @@ were merged and it can create conflicts. This is why you have to rebase
on `master` every time before pushing your changes and check that your on `master` every time before pushing your changes and check that your
branch doesn't have any conflicts with `master`. branch doesn't have any conflicts with `master`.
Thank you. Thank you.

View File

@ -22,18 +22,16 @@
4. 修改代码 4. 修改代码
5. 别忘了将你自己的账户添加到`CONTRIBUTORS.md`. 5. 提交代码并推送到服务器然后从Github提交pull request。
6. 提交代码并推送到服务器然后从Github提交pull request。 git commit --signoff
git commit --signoff
git push git push
7. 等待审查,如果被接受,你的修改将会被合并到主分支。 6. 等待审查,如果被接受,你的修改将会被合并到主分支。
**注意** **注意**
请不要忘记更新你的fork。当你修改代码时主分支的内容可能已被修改因为其他用户提交的pull request被合并 请不要忘记更新你的fork。当你修改代码时主分支的内容可能已被修改因为其他用户提交的pull request被合并
这就会产生代码冲突。这就是为什么在你每次修改前都要在你的主分支上进行rebase操作 这就会产生代码冲突。这就是为什么在你每次修改前都要在你的主分支上进行rebase操作
谢谢. 谢谢.

View File

@ -1,3 +0,0 @@
Thank you to all contributors:
------------------------------
[Jianhui Zhao](https://github.com/zhaojh329)