diff --git a/docs/contributing/How-To-Contribute.html b/docs/contributing/How-To-Contribute.html index 4fc24b9..2a3923c 100644 --- a/docs/contributing/How-To-Contribute.html +++ b/docs/contributing/How-To-Contribute.html @@ -43,8 +43,8 @@ title: How To Contribute
  1. Make sure that your local repository is in sync with the online repository before and after you make any changes. This helps to avoid conflicts.
    2. -
  2. It's always best to make commits in your own branch, and merge them into the repository's master branch when you're done working. For one-off commits the advantage is not so clear, but if you are making a set of commits with a common theme, a branch will help keep things organised.
    3. -
  3. If you have committed changes to your local repository, and someone else synced their changes to the online repository after you last synced, then you may need to manually merge the changes. You'll know if you have to do this because GFW will give you an error message when you try to sync, in which case see Resolving Conflicts.
    4. +
  4. It's always best to make commits in a new branch, and merge them into the repository's default branch when you're done working. For one-off commits the advantage is not so clear, but if you are making a set of commits with a common theme, a branch will help keep things organised.
    5. +
  5. If you have committed changes to your local repository, and someone else synced their changes to the online repository after you last synced, then you may need to manually merge the changes. You'll know if you have to do this because GitHub Desktop will give you an error message when you try to sync, in which case see Resolving Conflicts.
  6. You should also have a read of the Team Policies and Team Member Responsibilities pages to familiarise yourself with their contents.