Skip to content
This repository has been archived by the owner on Jan 25, 2023. It is now read-only.

Commit

Permalink
Update CONTRIBUTING.md
Browse files Browse the repository at this point in the history
Clarify that work should be merged into the master branch, and that trivial changes are allowed directly on the master branch without needing a topic branch.
  • Loading branch information
tonyroberts authored Jun 23, 2016
1 parent 2534303 commit f1a66e1
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ written, documented and tested pull requests are encouraged.
branch.
* To quickly create a topic branch based on master; `git checkout -b
fix/develop/my_contribution master`. Please avoid working directly on the
`master` branch.
`master` branch for anything other than trivial changes.
* Make commits of logical units.
* Check for unnecessary whitespace with `git diff --check` before committing.
* Make sure your commit messages are in the proper format.
Expand All @@ -29,7 +29,7 @@ written, documented and tested pull requests are encouraged.

## Submitting Changes

* Push your changes to a topic branch in your fork of the repository.
* Merge your topic branch into master and push to your fork of the repository.
* Submit a pull request to the repository in the pythonnet organization.
* After feedback has been given we expect responses within two weeks. After two
weeks we may close the pull request if it isn't showing any activity.
Expand Down

0 comments on commit f1a66e1

Please sign in to comment.