From 01503b312880e0abc778bc4a100f32f52378748c Mon Sep 17 00:00:00 2001 From: Jianhui Zhao Date: Mon, 11 Dec 2017 17:19:33 +0800 Subject: [PATCH] No need CONTRIBUTORS.md Signed-off-by: Jianhui Zhao --- CONTRIBUTING.md | 12 +++++------- CONTRIBUTING_ZH.md | 12 +++++------- CONTRIBUTORS.md | 3 --- 3 files changed, 10 insertions(+), 17 deletions(-) delete mode 100755 CONTRIBUTORS.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b0c3afa..370a9e5 100755 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -22,14 +22,12 @@ If you want to contribute to [libuhttp](https://github.com/zhaojh329/libuhttp), 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 - -7. Awaiting review, if accepted, merged! + +6. Awaiting review, if accepted, merged! **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 branch doesn't have any conflicts with `master`. -Thank you. \ No newline at end of file +Thank you. diff --git a/CONTRIBUTING_ZH.md b/CONTRIBUTING_ZH.md index 8b4b6fe..9c35068 100755 --- a/CONTRIBUTING_ZH.md +++ b/CONTRIBUTING_ZH.md @@ -22,18 +22,16 @@ 4. 修改代码 -5. 别忘了将你自己的账户添加到`CONTRIBUTORS.md`. +5. 提交代码并推送到服务器,然后从Github提交pull request。 -6. 提交代码并推送到服务器,然后从Github提交pull request。 - - git commit --signoff + git commit --signoff git push - -7. 等待审查,如果被接受,你的修改将会被合并到主分支。 + +6. 等待审查,如果被接受,你的修改将会被合并到主分支。 **注意** 请不要忘记更新你的fork。当你修改代码时,主分支的内容可能已被修改,因为其他用户提交的pull request被合并, 这就会产生代码冲突。这就是为什么在你每次修改前都要在你的主分支上进行rebase操作 -谢谢. \ No newline at end of file +谢谢. diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md deleted file mode 100755 index 2d0f5b3..0000000 --- a/CONTRIBUTORS.md +++ /dev/null @@ -1,3 +0,0 @@ -Thank you to all contributors: ------------------------------- -[Jianhui Zhao](https://github.com/zhaojh329) \ No newline at end of file