vndb/mithril-vndb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

docs: add master -> next merge for package.json

Browse source
This commit is contained in:
Pat Cavit 2017-04-13 09:42:22 -07:00 • committed by GitHub
parent 70762bd2b5
commit 034ef4d318
1 changed files with 25 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

26
docs/releasing.md
View file

@ -61,9 +61,33 @@ $ git push lhorie master
11. Travis will push the new release to npm & create a GitHub release 11. Travis will push the new release to npm & create a GitHub release
### Merge `master` back into `next`
This helps to ensure that the `version` field of `package.json` doesn't get out of date.
12. Switch to `next` and make sure it's up to date
```bash
$ git co next
$ git pull --rebase lhorie next
```
13. Merge `master` back onto `next`
```bash
$ git merge master
```
14. Push the changes to your fork & `lhorie/mithril.js`
```bash
$ git push
$ git push lhorie next
```
### Update the GitHub release ### Update the GitHub release
12. The GitHub Release will require a manual description & title to be added. I suggest coming up with a fun title & then copying the `docs/change-log.md` entry for the build. 15. The GitHub Release will require a manual description & title to be added. I suggest coming up with a fun title & then copying the `docs/change-log.md` entry for the build.
## Updating mithril.js.org ## Updating mithril.js.org