Skip to content

Commit

Permalink
We no longer use git flow.
Browse files Browse the repository at this point in the history
  • Loading branch information
sorccu committed Aug 7, 2016
1 parent 6529ea0 commit 8cb5954
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 48 deletions.
10 changes: 4 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ We are happy to accept any contributions that make sense and respect the rules l
## How to contribute

1. Fork the repo.
2. Create a feature branch for your contribution out of the `develop` branch. We use the [git-flow][gitflow-tool] tool to implement the [successful Git branching model][gitflow-post]. Only one contribution per branch is accepted.
2. Create a feature branch for your contribution out of the `master` branch. Only one contribution per branch is accepted.
3. Implement your contribution while respecting our rules (see below).
4. Run `npm test` to make sure you didn't break anything.
5. Add tests for your contribution so that no one else will break it.
6. Submit a pull request against our `develop` branch!
4. If possible, add tests for your contribution to make sure it actually works.
5. Don't forget to run `npm test` just right before submitting, it also checks for code styling issues.
6. Submit a pull request against our `master` branch!

## Rules

Expand All @@ -25,6 +25,4 @@ We are happy to accept any contributions that make sense and respect the rules l

By contributing your code, you agree to license your contribution under our [LICENSE](LICENSE).

[gitflow-post]: <http://nvie.com/posts/a-successful-git-branching-model/>
[gitflow-tool]: <https://github.com/nvie/gitflow>
[editorconfig]: <http://editorconfig.org/>
42 changes: 0 additions & 42 deletions git_hooks/pre-commit/version

This file was deleted.

0 comments on commit 8cb5954

Please sign in to comment.