Skip to content

Commit 01028f5

Browse files
author
Jeremy Brown
committed
Preparation for removal of develop branch
1 parent 9227aee commit 01028f5

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

CONTRIBUTING.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ Think you've found a bug or have a new feature to suggest? Let us know!
1414

1515
## Reporting a Bug
1616

17-
1. Make sure you have the latest version of the code, if possible, as we may have already fixed your bug. This
18-
project uses the [git-flow branching model](https://github.com/nvie/gitflow) so the latest changes will be in the
19-
develop` branch.
17+
1. Make sure you have the latest version of the code, if possible, as we may have already fixed your bug.
2018

2119
2. Search for similar issues. It's possible somebody has encountered this bug already.
2220

@@ -67,9 +65,8 @@ Here's a quick guide:
6765
2. Commit your changes. If your pull request fixes an issue specify it in the commit message. Here's an example:
6866
`git commit -m "Close #12 Fix passing of context"`
6967

70-
6. Push to your fork and submit a pull request againt the `develop` branch (due to our use of the
71-
[git-flow branching model](https://github.com/nvie/gitflow)). Please provide us with some explanation of why you made
72-
the changes you made. For new features make sure to explain a standard use case to us.
68+
6. Push to your fork and submit a pull request againt the `master` branch. Please provide us with some explanation of
69+
why you made the changes you made. For new features make sure to explain a standard use case to us.
7370

7471
We try to be quick about responding to tickets but sometimes we get a bit backlogged. If the response is slow, try
7572
to find someone on IRC(#softlayer) to give the ticket a review.

RELEASE-INSTRUCTIONS.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22

33
This document captures the steps a project maintainer should follow when releasing a new version of this project.
44

5-
* Merge all desired pull requests into `develop` branch
6-
* Merge `develop` branch into `master` branch
5+
* Merge all desired pull requests into `master` branch
76
* Run these commands:
87
* `npm version x.x.x`, where *x.x.x* is the Semantic Version of the changeset
98
* `git push origin master`
109
* `git push origin --tags`
1110
* `npm publish --registry http://registry.npmjs.org/`
12-
* Note: `--registry` flag is workaround for occasional issues with default SSL url
13-
* Merge `master` branch into `develop`
11+
* Note: `--registry` flag is workaround for occasional issues with default SSL url

0 commit comments

Comments
 (0)