diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f86ada8..e935d35 100755 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -14,9 +14,7 @@ Think you've found a bug or have a new feature to suggest? Let us know! ## Reporting a Bug -1. Make sure you have the latest version of the code, if possible, as we may have already fixed your bug. This -project uses the [git-flow branching model](https://github.com/nvie/gitflow) so the latest changes will be in the -develop` branch. +1. Make sure you have the latest version of the code, if possible, as we may have already fixed your bug. 2. Search for similar issues. It's possible somebody has encountered this bug already. @@ -67,9 +65,8 @@ Here's a quick guide: 2. Commit your changes. If your pull request fixes an issue specify it in the commit message. Here's an example: `git commit -m "Close #12 Fix passing of context"` -6. Push to your fork and submit a pull request againt the `develop` branch (due to our use of the -[git-flow branching model](https://github.com/nvie/gitflow)). Please provide us with some explanation of why you made -the changes you made. For new features make sure to explain a standard use case to us. +6. Push to your fork and submit a pull request againt the `master` branch. Please provide us with some explanation of +why you made the changes you made. For new features make sure to explain a standard use case to us. We try to be quick about responding to tickets but sometimes we get a bit backlogged. If the response is slow, try to find someone on IRC(#softlayer) to give the ticket a review. diff --git a/RELEASE-INSTRUCTIONS.md b/RELEASE-INSTRUCTIONS.md index d83a6f9..f53160f 100755 --- a/RELEASE-INSTRUCTIONS.md +++ b/RELEASE-INSTRUCTIONS.md @@ -2,12 +2,10 @@ This document captures the steps a project maintainer should follow when releasing a new version of this project. -* Merge all desired pull requests into `develop` branch -* Merge `develop` branch into `master` branch +* Merge all desired pull requests into `master` branch * Run these commands: * `npm version x.x.x`, where *x.x.x* is the Semantic Version of the changeset * `git push origin master` * `git push origin --tags` * `npm publish --registry http://registry.npmjs.org/` - * Note: `--registry` flag is workaround for occasional issues with default SSL url -* Merge `master` branch into `develop` \ No newline at end of file + * Note: `--registry` flag is workaround for occasional issues with default SSL url \ No newline at end of file