nikon/docsearch
1
0
Fork 0
Code Activity Actions

Merge branch 'develop'

Browse source
This commit is contained in:
vvo 2016-12-13 14:35:55 +01:00
commit 30c4de3769
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
CONTRIBUTING.md
View file

@ -144,7 +144,7 @@ Once the a fix is done, having the fix in the `develop` branch is not sufficient
So that you never ask yourself "Is this released?".
Instead of closing the issue, we will add a ` ✔ to be released` label.
Instead of closing the issue, we will add a ` to be released` label.
# Releasing
@ -160,6 +160,17 @@ npm run release
This task will merge develop into master.
## Releasing v1
```sh
git checkout v1
git pull
npm run release
```
We use the `v1` branch as a way to push fixes to the first version of DocSearch. Never merge `master` or `develop` into `v1` and
vice versa.
## Beta releases
You must be on the develop branch.