Skip to content

Commit

Permalink
Preparation for removal of develop branch
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeremy Brown committed Jul 6, 2015
1 parent 9227aee commit 01028f5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 10 deletions.
9 changes: 3 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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.
Expand Down
6 changes: 2 additions & 4 deletions RELEASE-INSTRUCTIONS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`
* Note: `--registry` flag is workaround for occasional issues with default SSL url

0 comments on commit 01028f5

Please sign in to comment.