Permalink
Browse files

Merge redundant CONTRIBUTING files

  • Loading branch information...
1 parent fc21079 commit 942e752a1c68d77e4377c76328ab1433f46e0541 Marlow Payne committed Jun 13, 2016
Showing with 38 additions and 51 deletions.
  1. +38 −8 .github/CONTRIBUTING.md
  2. +0 −43 CONTRIBUTING.md
@@ -1,11 +1,41 @@
-# Contributing to Bellows
+## Contributing
-## Bugs, Feature Requests
-Submit an [issue](https://github.com/mobify/bellows/issues).
+We love pull requests, and other people helping maintain our code. If you want to contribute, please follow these guidelines.
-## Pull Requests
+### Bugfixes
-1. Make a new branch from `develop`.
-1. Do your work.
-1. Update the README + CHANGELOG.
-1. Open a PR against `develop`.
+Create an issue in our [issue tracker](https://github.com/mobify/bellows/issues) describing the problem. Follow the steps below, fixing the bug in your fork. Don't forget to add tests!
+
+### General Contribution Guidelines
+
+Fork, then clone the repo:
+
+```
+git clone https://github.com/your-username/bellows.git
+```
+
+Ensure the tests pass:
+
+```
+grunt test
+```
+
+Make your changes, add tests for your changes, then run the tests again:
+
+```
+grunt test
+```
+
+### Building a release
+
+Releases are built into the `dist` directory. To build a release, do the following:
+
+Increment the version number in the package.json file according to the [semver](http://semver.org/) specification.
+
+Run the following `grunt` task to build the dist:
+
+```
+grunt build
+```
+
+Push to your fork, and open a [pull request](https://github.com/mobify/bellows/compare). Please ensure you describe your changes in your pull request, as they have a higher likelihood of being merged.
View
@@ -1,43 +0,0 @@
-## Contributing
-
-We love pull requests, and other people helping maintain our code. If you want to contribute, please follow these guidelines.
-
-### Bugfixes
-
-Create an issue in our [issue tracker](https://github.com/mobify/bellows/issues) describing the problem. Follow the steps below, fixing the bug in your fork. Don't forget to add tests!
-
-### General Contribution Guidelines
-
-Fork, then clone the repo:
-
-```
-git clone https://github.com/your-username/bellows.git
-```
-
-Ensure the tests pass:
-
-```
-grunt test
-```
-
-Make your changes, add tests for your changes, then run the tests again:
-
-```
-grunt test
-```
-
-### Building a release
-
-Releases are built into the `dist` directory. To build a release, do the following:
-
-Increment the version number in the package.json file according to the [semver](http://semver.org/) specification.
-
-Run the following `grunt` task to build the dist:
-
-```
-grunt build
-```
-
-Push to your fork, and open a [pull request](https://github.com/mobify/bellows/compare). Please ensure you describe your changes in your pull request, as they have a higher liklihood of being merged.
-
-

0 comments on commit 942e752

Please sign in to comment.