Skip to content

Commit

Permalink
update readme
Browse files Browse the repository at this point in the history
  • Loading branch information
SeeThruHead committed Sep 3, 2015
1 parent 7b2941c commit fcca8cd
Showing 1 changed file with 15 additions and 6 deletions.
21 changes: 15 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -217,17 +217,26 @@ Reference:
## Publish & Release
#### Git convention
Branches:
Master: Tagged branches pushed to npm registry, release branched merged from development, hotfix branches merged from hotfix/<hotfix-name>
Development: Development branch to merge new features/non-critical fixes into
Features: `feature/<feature-name>`
hotfix: `hotfix/<hotfix name>`
Committing:
- rebase your feature branch off master
- bump version using npm version <major|minor|patch>
- rebase your feature branch off master(hotfix) or development(feature)
- push and create pull request for review
- merge feature into master
- git checkout master && git pull master && npm publish
- `git push origin --tags`
- go to github tags view, and create release notes, referencing commits for feature changes/additions
- merge feature into development, hotfix into master
Publishing:
After merging into master:
- git checkout master && git pull master
- npm version <patch(hotfix)|minor(feature-additiont)|major(breaking api changes and major releases)>
- npm publish
- git push --tags

0 comments on commit fcca8cd

Please sign in to comment.