Skip to content
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

Create CONTRIBUTING.md #3

Merged
merged 5 commits into from
Nov 26, 2019
Merged

Create CONTRIBUTING.md #3

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6609b1a
Added CONTRIBUTING.md file, with open source development directions.
ben-bay Nov 21, 2019
9701cdf
Merge branch 'develop' into docs/ben/contributing
ben-bay Nov 22, 2019
faef00f
updated contributing.md
ben-bay Nov 22, 2019
e241727
Merge branch 'develop' into docs/ben/contributing
ben-bay Nov 22, 2019
4fd1f0c
Merge branch 'develop' into docs/ben/contributing
ben-bay Nov 22, 2019
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
15 changes: 15 additions & 0 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Contributing

Merlin is open source software, and we welcome contribution!

We follow a gitflow - like [this](http://www.dalescott.net/using-gitflow-with-githubs-fork-pull-model/).
To contribute, fork your own copy.
All changes are done via pull requests from your fork into the appropriate main repository branch.
Features and additions into `develop`, hot fixes into `master`.

### Squash
Before merging a pull request, please [squash your commits](https://github.com/LLNL/merlin/wiki/Squash-commits) down to a single concise commit message.

### More...
Complete developer documentation is [here](https://merlin.readthedocs.io/en/latest/merlin_developer.html).