Skip to content

Commit 35383b1

Browse files
committed
Update DEVELOPING guide referencing dev branch
1 parent 24e12d2 commit 35383b1

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

DEVELOPING.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Common tasks:
3838
In order to create a release, the following should be completed in order.
3939

4040
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.
4242
1. Update the version number in the source code and the README. See [Versioning](#versioning) for information
4343
about selecting an appropriate version number. Files to change:
4444
- 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.
5858
adding "-alpha.1" in each file except the README. Building may have generated the docs files once again, so to clear
5959
them run `git checkout -- docs/`. Then stage the remaining files and commit with the message
6060
"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`
6262
1. Find the latest .jar in the build directory and upload this as an attached to the latest GitHub Release. Add release
6363
notes with a description of changes and fixes.
6464

@@ -81,7 +81,8 @@ During development the version number should end in "-alpha.x" or "-beta.x", whe
8181

8282
### Branches
8383

84-
* `master` - the main development branch.
84+
* `dev` - the main development branch.
85+
* `master` - reflects the latest stable release.
8586
* `feat.foo` - feature branches. these are used for longer running tasks that cannot be accomplished in one commit.
8687
once merged into master, these branches should be deleted.
8788
* `vx.x.x` - if development for a future version/milestone has begun while master is working towards a sooner

0 commit comments

Comments
 (0)