浏览代码

Merge pull request #362 from 29jm/patch-1

Improved CONTRIBUTING.md
0xAX 9 年之前
父节点
当前提交
b8a1592342
共有 1 个文件被更改,包括 8 次插入5 次删除
  1. 8 5
      CONTRIBUTING.md

+ 8 - 5
CONTRIBUTING.md

@@ -3,28 +3,31 @@ Contributing
 
 If you want to contribute to [linux-insides](https://github.com/0xAX/linux-insides), please follow these simple rules:
 
-1. Press fork button:
+1. Press the fork button:
 
     ![fork](http://oi58.tinypic.com/jj2trm.jpg)
 
-2. Clone the repo from your account with:
+2. Clone the repository from your account with:
 
     ```
     git clone git@github.com:your_github_username/linux-insides.git
     ```
 
-3. Create branch with:
+3. Create a new branch with:
 
     ```
     git checkout -b "linux-bootstrap-1-fix"
     ```
+    You can name it however you want.
 
 4. Make your changes.
 
-5. Don't forget to add yourself in `contributors.md`
+5. Don't forget to add yourself in `contributors.md`.
+
+6. Commit and push your changes, then make a pull request from Github.
 
 **IMPORTANT**
 
-Please, make the actual changes. While you made your changes, I can merge changes from somebody else and your changes can conflict with `master` branch content. Please rebase on master every time before you're going to push your changes and check that your branch doesn't conflict with `master`.
+Please, don't forget to update your fork. While you made your changes, the content of the `master` branch can change because other pull requests 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.