Skip to content

Commit

Permalink
Merge pull request #3 from LLNL/docs/ben/contributing
Browse files Browse the repository at this point in the history
Create CONTRIBUTING.md
  • Loading branch information
ben-bay authored Nov 26, 2019
2 parents f62b19d + 4fd1f0c commit 0ae621b
Showing 1 changed file with 15 additions and 0 deletions.
15 changes: 15 additions & 0 deletions CONTRIBUTING.md
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).

0 comments on commit 0ae621b

Please sign in to comment.