PvE/Torch
3
0
Fork 0
Code Issues 1 Pull Requests Actions Releases 21 Wiki Activity

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Westin Miller
2017-09-07 15:39:04 -07:00
parent c8f0a61209 64f123abe9
commit 52b225d944
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CONTRIBUTING.md
View File

@@ -1,9 +1,9 @@
# Making a Pull Request # Making a Pull Request
* Fork this repository and make sure your local **master** branch is up to date with the main repository. * Fork this repository and make sure your local **staging** branch is up to date with the main repository.
* Create a new branch for your addition with an appropriate name, e.g. **add-restart-command** * Create a new branch from the **staging** branch for your addition with an appropriate name, e.g. **add-restart-command**
* PRs work by submitting the *entire* branch, so this allows you to continue work without locking up your whole repository. * PRs work by submitting the *entire* branch, so this allows you to continue work without locking up your whole repository.
* Commit your changes to that branch, making sure that you **follow the code guidelines below**. * Commit your changes to that branch, making sure that you **follow the code guidelines below**.
* Submit your branch as a PR to be reviewed. * Submit your branch as a PR to be reviewed, with Torch's **staging** branch as the base.
## Naming Conventions ## Naming Conventions
* Types: **PascalCase** * Types: **PascalCase**