Skip to content

Update contributing.md #243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mcgalcode merged 1 commit into from
Mar 4, 2020
Merged

Update contributing.md #243

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ Docstrings must follow [Numpy style](https://numpydoc.readthedocs.io/en/latest/f
For additional (non-binding) inspiration, check out the [Google Python Style Guide](https://github.com/google/styleguide/blob/gh-pages/pyguide.md).

## PR Submission
Features should be developed in a branch with a descriptive name and the pull request (PR) submitted into the `develop` branch.
In order to be merged a PR must be approved by one authorized user and the build must pass.
Features should be developed in a branch with a descriptive name and the pull request (PR) submitted into the `master` branch.
In order to be merged, a PR must be approved by one authorized user and the build must pass.
A passing build requires the following:
* All tests pass
* The linter finds no violations of PEP8 style
Expand Down