@@ -38,7 +38,7 @@ Common tasks:
38
38
In order to create a release, the following should be completed in order.
39
39
40
40
1 . Ensure all the tests are passing (` gradle check ` ) and that there is enough test coverage.
41
- 1 . Make sure you are on the ` master ` branch of the repository, with all changes merged/commited already.
41
+ 1 . Make sure you are on the ` dev ` branch of the repository, with all changes merged/commited already.
42
42
1 . Update the version number in the source code and the README. See [ Versioning] ( #versioning ) for information
43
43
about selecting an appropriate version number. Files to change:
44
44
- src/main/java/com/opentok/constants/Version.java
@@ -58,7 +58,7 @@ In order to create a release, the following should be completed in order.
58
58
adding "-alpha.1" in each file except the README. Building may have generated the docs files once again, so to clear
59
59
them run ` git checkout -- docs/ ` . Then stage the remaining files and commit with the message
60
60
"Begin development on next version".
61
- 1 . Push the changes to the source repository: ` git push origin master ; git push --tags origin `
61
+ 1 . Push the changes to the source repository: ` git push origin dev ; git push --tags origin `
62
62
1 . Find the latest .jar in the build directory and upload this as an attached to the latest GitHub Release. Add release
63
63
notes with a description of changes and fixes.
64
64
@@ -81,7 +81,8 @@ During development the version number should end in "-alpha.x" or "-beta.x", whe
81
81
82
82
### Branches
83
83
84
- * ` master ` - the main development branch.
84
+ * ` dev ` - the main development branch.
85
+ * ` master ` - reflects the latest stable release.
85
86
* ` feat.foo ` - feature branches. these are used for longer running tasks that cannot be accomplished in one commit.
86
87
once merged into master, these branches should be deleted.
87
88
* ` vx.x.x ` - if development for a future version/milestone has begun while master is working towards a sooner
0 commit comments